SF.net SVN: safekeep: [334] safekeep/trunk/safekeep-test

[<di...@us...>]

Revision: 334
          http://safekeep.svn.sourceforge.net/safekeep/?rev=334&view=rev
Author:   dimi
Date:     2007-01-30 07:32:16 -0800 (Tue, 30 Jan 2007)

Log Message:
-----------
Make sure the version we expect ends up being installed

Modified Paths:
--------------
    safekeep/trunk/safekeep-test

Modified: safekeep/trunk/safekeep-test
===================================================================
--- safekeep/trunk/safekeep-test	2007-01-30 15:25:22 UTC (rev 333)
+++ safekeep/trunk/safekeep-test	2007-01-30 15:32:16 UTC (rev 334)
@@ -165,7 +165,7 @@
         shutil.rmtree(os.path.join(tmproot, 'restore'))
         time.sleep(1) 
 
-def takeOver(host, role):
+def takeOver(host, role, verrel):
     cmd = 'ssh -o PasswordAuthentication=no root@%s true' % (host)
     if os.system(cmd): 
         print 'The box %s does not appear to have been initialized' % (host)
@@ -207,9 +207,12 @@
     cmd = 'echo %s > /etc/yum.repos.d/lattica-development.repo' % (mkarg(lattica_repo).strip())
     rcmd(cmd, 'root', host, 'install Lattica Repo')
     cmd = 'rm -rf /var/cache/yum/lattica-development/; ' + \
-          'if rpm -q safekeep-%(role)s; ' + \
-          'then yum update -y safekeep-%(role)s; ' + \
-          'else yum install -y safekeep-%(role)s; fi' % { 'role': role }
+          'if rpm -q safekeep-%(role)s-%(verrel)s; ' + \
+          'then yum update -y safekeep-%(role)s-%(verrel); ' + \
+          'else yum install -y safekeep-%(role)s-%(verrel); ' + \
+          'fi; ' + \
+          'rpm -q safekeep-%(role)s | grep %(verrel)s' \
+          % { 'role': role, 'verrel': verrel }
     rcmd(cmd, 'root', host, 'install safekeep')
 
 def createKey(user, host, keyname, comment):
@@ -278,8 +281,10 @@
             raise TestFailure('Failed to copy safekee-*-%s-1.noarch.rpm to the repository' % ver) 
     
         cmd = 'createrepo %s' % mkarg(repodir)
-        rcmd(cmd, user, host, 'update repo metadata') 
+        rcmd(cmd, user, host, 'update repo metadata')
 
+    return ver + '-1'
+
 def remoteTest(tmproot, client, server):
     # build, sign and upload the .rpm
     repodirs = [
@@ -287,10 +292,10 @@
         '/var/www/repos/lattica/yum/fedora/6/devel/i386',
         '/var/www/repos/lattica/yum/centos/4/devel/i386',
     ]
-    packageAndUpload(tmproot, 'Lattica, Inc. (Devel Key) <de...@la...>', repodirs, 'root', 'ulysses')
+    verrel = packageAndUpload(tmproot, 'Lattica, Inc. (Devel Key) <de...@la...>', repodirs, 'root', 'ulysses')
 
-    takeOver(client, 'client')
-    takeOver(server, 'server')
+    takeOver(client, 'client', verrel)
+    takeOver(server, 'server', verrel)
 
     # setup the server
     client_addr = socket.gethostbyname(client)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.