Changeset 3278

Timestamp:

Aug 18, 2010 3:18:24 AM (14 years ago)

Author:

bennylp

Message:

Automated test (re #1111): modified run_continuous.py script to also do Nightly build every day at 00:00 GMT

File:

• pjproject/trunk/tests/automated/run_continuous.py (modified) (3 diffs)

pjproject/trunk/tests/automated/run_continuous.py

@@ -6 +6 @@
 import ccdash
 
-GROUP = "Continuous"
 INTERVAL = 300
+
+def run_scenarios(scenarios, group):
+        # Run each scenario
+        rc = 0
+        for scenario in scenarios:
+                argv = []
+                argv.append("ccdash.py")
+                argv.append("scenario")
+                argv.append(scenario)
+                argv.append("--group")
+                argv.append(group)
+                thisrc = ccdash.main(argv)
+                if rc==0 and thisrc:
+                        rc = thisrc
+        return rc
+
 
 if __name__ == "__main__":
         if len(sys.argv)<=1 or sys.argv[1]=="-h" or sys.argv[1]=="--h" or sys.argv[1]=="/h":
+                print "This will run both Continuous and Nightly tests"
+                print ""
                 print "Usage: run_continuous.py scenario1.xml [scenario2.xml ...]"
-                sys.exit(0)
+                print ""
+                sys.exit(1)
 
         # Splice list
@@ -22 +40 @@
                         print "Error: file " + scenario + " does not exist"
                         sys.exit(1)
+
+        # Current date
+        utc = time.gmtime(None)
+        day = utc.tm_mday
 
         # Loop foreva
@@ -34 +56 @@
                 rc = ccdash.main(argv)
 
-                if rc==0:
+                utc = time.gmtime(None)
+
+                if utc.tm_mday != day or rc != 0:
+                                group = ""
+                                if utc.tm_mday != day:
+                                        day = utc.tm_mday
+                                        group = "Nightly"
+                                elif rc != 0:
+                                        group = "Continuous"
+                                else:
+                                        group = "Experimental"
+                                rc = run_scenarios(scenarios, group)
+                                # Sleep even if something does change
+                                print str(datetime.datetime.now()) + \
+                                          ": done running " + group + \
+                                          "tests, will check again in " + str(INTERVAL) + "s.."
+                                time.sleep(INTERVAL)
+                else:
                         # Nothing changed
-                        print str(datetime.datetime.now()) + ": No update, will check again in " + str(INTERVAL) + "s.."
+                        print str(datetime.datetime.now()) + \
+                                  ": No update, will check again in " + str(INTERVAL) + "s.."
                         time.sleep(INTERVAL)
-                        continue
                         
-                # Run each scenario
-                for scenario in scenarios:
-                        argv = []
-                        argv.append("ccdash.py")
-                        argv.append("scenario")
-                        argv.append(scenario)
-                        argv.append("--group")
-                        argv.append(GROUP)
-                        thisrc = ccdash.main(argv)
-                        if rc==0 and thisrc:
-                                rc = thisrc
 
-                # Sleep even if something does change
-                print str(datetime.datetime.now()) + ": done, will check again in " + str(INTERVAL) + "s.."
-                time.sleep(INTERVAL)
-