test_rsc

svn path=/trunk/boinc/; revision=1594

checkin_notes

@@ -5048,6 +5048,7 @@ Karl    2003/06/25
       limit" instead of "Couldn't upload files"
     - test that an aborted result due to file limit causes client_state =
       RESULT_RESULT_OUTCOME_CLIENT_ERROR (currently this test FAILS!)
+    - test resource limits in python
 
     db/
         boinc_db.h
@@ -5058,6 +5059,7 @@ Karl    2003/06/25
     test/
         boinc.py
         test_abort.py (new)
+        test_rsc.py (new)
         test_backend.py
         test_concat.py
         test_uc.py

test/Makefile.am

@@ -2,17 +2,12 @@
 
 include $(top_srcdir)/Makefile.incl
 
-# TESTS = test_sanity.php				\
-# 	test_uc.php				\
-# 	test_concat.php				\
-# 	test_1sec.php				\
-# 	test_rsc.php				\
-# 	test_backend.php
-
 TESTS = test_sanity.py				\
 	test_uc.py				\
 	test_concat.py				\
 	test_1sec.py				\
+	test_abort.py				\
+	test_rsc.py				\
 	test_backend.py
 
 EXTRA_DIST =					\

test/Makefile.in

@@ -180,6 +180,7 @@ TESTS = test_sanity.py				\
 	test_uc.py				\
 	test_concat.py				\
 	test_1sec.py				\
+	test_abort.py				\
 	test_backend.py
 
 

test/boinc.py

@@ -751,7 +751,7 @@ class Host:
         self.global_prefs = None
         self.log_flags = 'log_flags.xml'
         self.host_dir = os.path.join(HOSTS_DIR, self.name)
-        self.defargs = "-exit_when_idle -skip_cpu_benchmarks"
+        self.defargs = "-exit_when_idle -skip_cpu_benchmarks -sched_retry_delay_min 1"
 
     def add_user(self, user, project):
         self.users.append(user)
@@ -792,7 +792,7 @@ class Host:
             if pid: return pid
         else:
             verbose_echo(1, "Running core client")
-        verbose_shell_call("cd %s && %s %s %s > client.out" % (
+        verbose_shell_call("cd %s && %s %s %s > client.out 2> client.err" % (
             self.dir(), os.path.join(SRC_DIR, 'client', CLIENT_BIN_FILENAME),
             self.defargs, args))
         if asynch: os._exit(0)

test/boinc_db.inc

@@ -1,5 +1,5 @@
 <?php
-    // Generated by db_def_to_php on Mon Jun 23 16:09:41 PDT 2003
+    // Generated by db_def_to_php on Wed Jun 25 17:24:03 PDT 2003
     define("MAX_BLOB_SIZE", 4096);
     define("TEAM_TYPE_CLUB", 1);
     define("TEAM_TYPE_COMPANY", 2);

test/boinc_db.py

@@ -1,4 +1,4 @@
-# Generated by db_def_to_py on Mon Jun 23 17:26:10 PDT 2003
+# Generated by db_def_to_py on Wed Jun 25 17:24:03 PDT 2003
 MAX_BLOB_SIZE = 4096
 TEAM_TYPE_CLUB = 1
 TEAM_TYPE_COMPANY = 2

test/test_abort.py

@@ -17,14 +17,9 @@ class ResultAbort(ResultUC):
         ResultUC.__init__(self)
         self.client_state = RESULT_OUTCOME_CLIENT_ERROR
 
-class HostAbort(Host):
-    def __init__(self):
-        Host.__init__(self)
-        self.defargs += ' -sched_retry_delay_min 1 2>client.err'
-
 class ProjectAbort(ProjectUC):
     def __init__(self):
-        ProjectUC.__init__(self, works=[WorkAbort()], hosts=[HostAbort()])
+        ProjectUC.__init__(self, short_name='test_abort', works=[WorkAbort()])
 
     def check(self):
         # no results should have been uploaded

test/test_rsc.py

@@ -0,0 +1,27 @@
+#!/usr/bin/env python
+
+## $Id$
+
+# Test whether the scheduling server filters out work units too big for client
+
+from test_uc import *
+
+class WorkTooBig(WorkUC):
+    def __init__(self):
+        WorkUC.__init__(self)
+        self.rsc_disk = 1000000000000   # 1 TB
+
+class ResultUnsent:
+    def __init__(self):
+        self.server_state = RESULT_SERVER_STATE_UNSENT
+
+class ProjectRsc(ProjectUC):
+    def __init__(self):
+        ProjectUC.__init__(self, short_name='test_rsc', works=[WorkTooBig()])
+    def check(self):
+        self.check_results(ResultUnsent())
+
+if __name__ == '__main__':
+    test_msg("resource filtering for large work units")
+    ProjectRsc()
+    run_check_all()