look for couchbase as well as membase for installation

Change-Id: I6fcc53ff359bf6fe713de2fd4c224c08aeb7e734
couchbase · Jun 20, 2011 · 88cda34 · 88cda34
1 parent 43362d0
commit 88cda34
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/pytests/management/install.py b/pytests/management/install.py
@@ -45,19 +45,20 @@ def test_reset(self):
     def _test_install(self,serverInfo,version,builds):
         query = BuildQuery()
         info = self.machine_infos[serverInfo.ip]
-        build = query.find_membase_build(builds,
-                                         'membase-server-enterprise',
-                                         info.deliverable_type,
-                                         info.architecture_type,
-                                         version.strip())
-        if not build:
-            self.log.info('find community edition build')
+        names = ['membase-server-enterprise',
+                 'membase-server-community',
+                 'couchbase-server-enterprise',
+                 'couchbase-server-community']
+        build = None
+        for name in names:
             build = query.find_membase_build(builds,
-                                             'membase-server-community',
+                                             name,
                                              info.deliverable_type,
                                              info.architecture_type,
                                              version.strip())
-            #try community ?
+            if build:
+                break
+
         if not build:
             self.fail('unable to find any {0} build for {1} for arch : {2} '.format(info.distribution_type,
                                                                                     info.architecture_type,