From 61700fbae372f4dbdbce6f1a8ccf6bee62bb4316 Mon Sep 17 00:00:00 2001 From: Douglas Clowes Date: Thu, 29 May 2014 13:44:57 +1000 Subject: [PATCH] Update test code --- site_ansto/instrument/TEST_SICS/unit_tests/sics_test.py | 2 ++ .../instrument/TEST_SICS/unit_tests/test_suite.tcl | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/site_ansto/instrument/TEST_SICS/unit_tests/sics_test.py b/site_ansto/instrument/TEST_SICS/unit_tests/sics_test.py index 1d8cfa0d..f17e3756 100644 --- a/site_ansto/instrument/TEST_SICS/unit_tests/sics_test.py +++ b/site_ansto/instrument/TEST_SICS/unit_tests/sics_test.py @@ -77,6 +77,8 @@ class Able(unittest.TestCase): outfile.write(line + '\n') if debug: print "config:", result, args, kw + self.assertFalse(result[0].startswith("can't read")) + self.assertFalse(result[0].startswith("... No dictionary ...")) ini = StringIO.StringIO("\n".join(result)) if debug: print "ini:", ini.readlines() diff --git a/site_ansto/instrument/TEST_SICS/unit_tests/test_suite.tcl b/site_ansto/instrument/TEST_SICS/unit_tests/test_suite.tcl index a76e8010..b003a255 100644 --- a/site_ansto/instrument/TEST_SICS/unit_tests/test_suite.tcl +++ b/site_ansto/instrument/TEST_SICS/unit_tests/test_suite.tcl @@ -11,14 +11,21 @@ namespace eval test_suite { # proc test_suite::show_config {the_dict} { upvar 1 $the_dict my_dict + if { ![info exists my_dict] } { + clientput "\[config\]" + clientput "missing = True" + clientput "present = False" + return + } foreach s [config_reader::get_sections my_dict] { set section "$s" - clientput "\n\[$section\]" + clientput "\[$section\]" foreach n [config_reader::get_variables my_dict $s] { set name "$n" set value "[config_reader::get_var my_dict $section $n]" clientput "$name = $value" } + clientput "" } }