From 611020a208439dc42f84169a51f1c0977101865d Mon Sep 17 00:00:00 2001
From: Hongqing Yang <hoyang@redhat.com>
Date: Apr 11 2012 08:02:58 +0000
Subject: run twice


---

diff --git a/tests/rats_install/control b/tests/rats_install/control
index 6dab0dc..776d0f8 100644
--- a/tests/rats_install/control
+++ b/tests/rats_install/control
@@ -12,6 +12,6 @@ The test cases covered by this test are:
 """
 MAINTAINER = "Hongqing Yang <hoyang@redhat.com>"
 
-for repo in ['updates','updates-testing']:
-    autoqa_args['repo']=repo
-    job.run_test('rats_install', tag=repo, **autoqa_args)
+for pkg in ['updates','updates-testing']:
+    autoqa_args['pkg'] = pkg
+    job.run_test('rats_install', tag=pkg, **autoqa_args)
diff --git a/tests/rats_install/install.py b/tests/rats_install/install.py
index 429e8e7..7e040c0 100755
--- a/tests/rats_install/install.py
+++ b/tests/rats_install/install.py
@@ -81,7 +81,7 @@ def _get_parser():
     return parser
 
 
-def parse_args(args=None):
+def parse_args(args=None, pkg=None):
     parser = _get_parser()
     (opt, args) = parser.parse_args(args)
 
@@ -109,8 +109,10 @@ def parse_args(args=None):
     anaconda.logdir = opt.logdir
 
     # if ksfile is not specifited, use the local default one
-    if not opt.ksfile:
-        opt.ksfile = os.path.join(opt.bindir,'ks.cfg')
+    if pkg == 'updates':
+        opt.ksfile = os.path.join(opt.bindir,'updates.cfg')
+    elif pkg == 'updates-testing':
+        opt.ksfile = os.path.join(opt.bindir,'updates-testing.cfg')
 
     opt.keyval_file = os.path.join(opt.logdir, 'keyval')
 
@@ -178,10 +180,10 @@ def system_sanity():
 
 
 #http://fedoraproject.org/wiki/QA:Rawhide_Acceptance_Test_Plan#Installability_2
-def main(args=None):
+def main(args=None, pkg=None):
 
     # Process command-line arguments
-    (opt, baseurl) = parse_args(args)
+    (opt, baseurl) = parse_args(args, pkg)
 
     if not system_sanity():
         return False
diff --git a/tests/rats_install/rats_install.py b/tests/rats_install/rats_install.py
index 35c53c5..2a29f36 100644
--- a/tests/rats_install/rats_install.py
+++ b/tests/rats_install/rats_install.py
@@ -50,9 +50,9 @@ class rats_install(AutoQATest):
         self.detail.arch = arch
         # set self.detail.id
         if name:
-            self.detail.id = "%s-%s" % (name, arch)
+            self.detail.id = "%s-%s-%s" % (name, arch, kwargs['pkg'])
         else:
-            self.detail.id = baseurl
+            self.detail.id = kwargs['pkg']+':'+baseurl
 
 
     @ExceptionCatcher()
@@ -71,7 +71,7 @@ class rats_install(AutoQATest):
             sys.stdout = util.Tee(sys.stdout, out, autoclose=False)
             sys.stderr = util.Tee(sys.stderr, out, autoclose=False)
             # run the test
-            success = install.main(args)
+            success = install.main(args,kwargs['pkg'])
             # collect results
             if success:
                 self.detail.result = 'PASSED'