Change in vdsm[master]: Upgrade test - add more old repos to upgrade from

[Code Review]

From Yaniv Bronhaim :

Yaniv Bronhaim has uploaded a new change for review.

Change subject: Upgrade test - add more old repos to upgrade from
......................................................................

Upgrade test - add more old repos to upgrade from

This patch adds master snapshot repo to the test.

Change-Id: I62124b45b8084c49c678e03287aa71f8eabb7f70
Signed-off-by: Yaniv Bronhaim 
---
M tests/functional/upgrade_vdsm_test.py
1 file changed, 9 insertions(+), 5 deletions(-)

git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/88/67788/1

diff --git a/tests/functional/upgrade_vdsm_test.py b/tests/functional/upgrade_vdsm_test.py
index 792acf7..6d7433c 100644
--- a/tests/functional/upgrade_vdsm_test.py
+++ b/tests/functional/upgrade_vdsm_test.py
@@ -21,8 +21,10 @@
 from vdsm.tool.service import service_start, service_status, service_stop

from testlib import VdsmTestCase
+from testlib import permutations, expandPermutations

-el7_ovirt36_repo = 'http://resources.ovirt.org/pub/ovirt-3.6/rpm/el7/'
+_EL7_OVIRT36_REPO_URL = 'http://resources.ovirt.org/pub/ovirt-3.6/rpm/el7/'
+_EL7_MASTER_REPO_URL = 'http://resources.ovirt.org/pub/ovirt-master-snapshot/rpm/el7/'

def run_command(command):
@@ -56,19 +58,21 @@
         run_command(['yum', 'install', '-y', 'vdsm'])
         service_start('vdsmd')

-    def service_up_test(self):
+    @permutations((_EL7_MASTER_REPO_URL, _EL7_OVIRT36_REPO_URL))
+    def service_up_test(self, old_repo):
         service_start('vdsmd')
         vdsm_version = run_command(['rpm', '-q', 'vdsm'])
-        downgrade_vdsm(el7_ovirt36_repo)
+        downgrade_vdsm(old_repo)
         upgrade_vdsm()

self.assertEqual(run_command(['rpm', '-q', 'vdsm']), vdsm_version)
         self.assertEqual(service_status('vdsmd'), 0)

-    def service_down_test(self):
+    @permutations((_EL7_MASTER_REPO_URL, _EL7_OVIRT36_REPO_URL))
+    def service_down_test(self, old_repo):
         service_stop('vdsmd')
         vdsm_version = run_command(['rpm', '-q', 'vdsm'])
-        downgrade_vdsm(el7_ovirt36_repo)
+        downgrade_vdsm(old_repo)
         upgrade_vdsm()

self.assertEqual(run_command(['rpm', '-q', 'vdsm']), vdsm_version)

[Code Review]

From Yaniv Bronhaim :

Yaniv Bronhaim has abandoned this change.

Change subject: Upgrade test - add more old repos to upgrade from
......................................................................

Abandoned