From 62aeab97a310392b30533c4393d7dda76b0aeff5 Mon Sep 17 00:00:00 2001
From: William Deegan <bill@baddogconsulting.com>
Date: Mon, 28 Nov 2022 17:03:11 -0800
Subject: Fix remaining tests failing on win32

---
 testing/framework/TestCmdTests.py    | 18 +++++++++------
 testing/framework/TestCommonTests.py | 45 ++++++++----------------------------
 2 files changed, 21 insertions(+), 42 deletions(-)

diff --git a/testing/framework/TestCmdTests.py b/testing/framework/TestCmdTests.py
index dfcb4b1..26bba28 100644
--- a/testing/framework/TestCmdTests.py
+++ b/testing/framework/TestCmdTests.py
@@ -19,8 +19,6 @@ Unit tests for the TestCmd.py module.
 # AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 
-__author__ = "Steven Knight <knight at baldmt dot com>"
-__revision__ = "TestCmdTests.py 1.3.D001 2010/06/03 12:58:27 knight"
 
 import os
 import shutil
@@ -2602,7 +2600,7 @@ script_recv:  STDERR:  input
             p.stdin.write(to_bytes(input))
             p.stdin.close()
             p.wait()
-            with open(t.recv_out_path, 'rb') as f:
+            with open(t.recv_out_path, 'r') as f:
                 result = to_str(f.read())
             expect = f"script_recv:  {input}"
             assert result == expect, f"Result:[{result}] should match\nExpected:[{expect}]"
@@ -2612,7 +2610,7 @@ script_recv:  STDERR:  input
             p.send(input)
             p.stdin.close()
             p.wait()
-            with open(t.recv_out_path, 'rb') as f:
+            with open(t.recv_out_path, 'r') as f:
                 result = to_str(f.read())
             expect = f"script_recv:  {input}"
             assert result == expect, repr(result)
@@ -2790,6 +2788,11 @@ class subdir_TestCase(TestCmdTestCase):
 class symlink_TestCase(TestCmdTestCase):
     def test_symlink(self):
         """Test symlink()"""
+        
+        #symlinks don't work well on windows
+        if sys.platform == 'win32':
+            return
+
         try: os.symlink
         except AttributeError: return
 
@@ -3173,9 +3176,10 @@ class writable_TestCase(TestCmdTestCase):
         test.write('file1', "Test file #1\n")
         test.write(['foo', 'file2'], "Test file #2\n")
 
-        try: symlink = os.symlink
-        except AttributeError: pass
-        else: symlink('no_such_file', test.workpath('dangling_symlink'))
+        if sys.platform != 'win32':
+            try: symlink = os.symlink
+            except AttributeError: pass
+            else: symlink('no_such_file', test.workpath('dangling_symlink'))
 
         test.writable(test.workdir, 0)
         # XXX skip these tests if euid == 0?
diff --git a/testing/framework/TestCommonTests.py b/testing/framework/TestCommonTests.py
index ed10fa5..93aa774 100644
--- a/testing/framework/TestCommonTests.py
+++ b/testing/framework/TestCommonTests.py
@@ -19,9 +19,6 @@ Unit tests for the TestCommon.py module.
 # AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 
-__author__ = "Steven Knight <knight at baldmt dot com>"
-__revision__ = "TestCommonTests.py 1.3.D001 2010/06/03 12:58:27 knight"
-
 import os
 import re
 import signal
@@ -983,6 +980,9 @@ class must_exist_TestCase(TestCommonTestCase):
 
     def test_broken_link(self) :
         """Test must_exist():  exists but it is a broken link"""
+        if sys.platform == 'win32':
+            return
+
         run_env = self.run_env
 
         script = lstrip("""\
@@ -1656,6 +1656,11 @@ class must_not_exist_TestCase(TestCommonTestCase):
 
     def test_existing_broken_link(self):
         """Test must_not_exist():  exists but it is a broken link"""
+
+        # symlinks don't really work on win32
+        if sys.platform == 'win32':
+            return
+
         run_env = self.run_env
 
         script = lstrip("""\
@@ -2398,38 +2403,8 @@ class variables_TestCase(TestCommonTestCase):
 
 
 if __name__ == "__main__":
-    tclasses = [
-        __init__TestCase,
-        banner_TestCase,
-        must_be_writable_TestCase,
-        must_contain_TestCase,
-        must_contain_all_lines_TestCase,
-        must_contain_any_line_TestCase,
-        must_contain_exactly_lines_TestCase,
-        must_contain_lines_TestCase,
-        must_exist_TestCase,
-        must_exist_one_of_TestCase,
-        must_match_TestCase,
-        must_not_be_writable_TestCase,
-        must_not_contain_TestCase,
-        must_not_contain_any_line_TestCase,
-        must_not_contain_lines_TestCase,
-        must_not_exist_TestCase,
-        must_not_exist_any_of_TestCase,
-        must_not_be_empty_TestCase,
-        run_TestCase,
-        start_TestCase,
-        skip_test_TestCase,
-        variables_TestCase,
-    ]
-    suite = unittest.TestSuite()
-    for tclass in tclasses:
-        loader = unittest.TestLoader()
-        loader.testMethodPrefix = 'test_'
-        names = loader.getTestCaseNames(tclass)
-        suite.addTests([tclass(n) for n in names])
-    if not unittest.TextTestRunner().run(suite).wasSuccessful():
-        sys.exit(1)
+    unittest.main()
+
 
 # Local Variables:
 # tab-width:4
-- 
cgit v0.12