Enable some tests (#1036)

* Enable some tests

* Disable test_system_timers

Author: slozier

Src/IronPython/Compiler/Ast/PythonNameBinder.cs

@@ -676,13 +676,15 @@ public override bool Walk(GlobalStatement node) {
             foreach (string n in node.Names) {
                 PythonVariable conflict;
                 // Check current scope for conflicting variable
+                bool assignedGlobal = false;
                 if (_currentScope.TryGetVariable(n, out conflict)) {
                     // conflict?
                     switch (conflict.Kind) {
                         case VariableKind.Global:
                             break;
 
                         case VariableKind.Local:
+                            assignedGlobal = true;
                             ReportSyntaxError($"name '{n}' is assigned to before global declaration", node);
                             break;
 
@@ -693,7 +695,7 @@ public override bool Walk(GlobalStatement node) {
                 }
 
                 // Check for the name being referenced previously
-                if (_currentScope.IsReferenced(n)) {
+                if (_currentScope.IsReferenced(n) && !assignedGlobal) {
                     ReportSyntaxError($"name '{n}' is used prior to global declaration", node);
                 }
 

Src/IronPython/Compiler/Tokenizer.cs

@@ -233,7 +233,11 @@ public override TokenInfo ReadToken() {
                     break;
 
                 case TokenKind.Constant:
-                    category = (token.Value is string) ? TokenCategory.StringLiteral : TokenCategory.NumericLiteral;
+                    category = token.Value switch {
+                        string => TokenCategory.StringLiteral,
+                        bool or null => TokenCategory.Keyword,
+                        _ => TokenCategory.NumericLiteral,
+                    };
                     break;
 
                 case TokenKind.LeftParenthesis:

Src/IronPythonTest/Cases/IronPythonCasesManifest.ini

@@ -131,7 +131,7 @@ IsolationLevel=PROCESS # for some reason this may fail without the IsolationLeve
 
 [IronPython.test_system_timers]
 Ignore=true
-Reason=Unstable
+Reason=Unstable - https://github.com/IronLanguages/ironpython3/issues/1037
 
 [IronPython.test_tcf]
 Ignore=true
@@ -150,21 +150,9 @@ RunCondition=NOT $(IS_MONO) # weakref failures
 RunCondition=NOT $(IS_MONO) # Mono codepage 852 encoding incorrecly decodes 0xAA to '?' instead of '¬'
 IsolationLevel=PROCESS # reset reporting of warnings
 
-[IronPython.hosting.editor_svcs.test_errorlistener]
-Ignore=true
-
-[IronPython.hosting.editor_svcs.test_tokencategorizer]
-Ignore=true
-
 [IronPython.interop.net.derivation.test_property_override]
 IsolationLevel=PROCESS # causes a failure in IronPython.test_statics
 
-[IronPython.interop.net.field.test_field_misc]
-Ignore=true
-
-[IronPython.interop.net.test_accessibility]
-Ignore=true
-
 [IronPython.interop.net.test_loadorder]
 Ignore=true
 

Tests/hosting/editor_svcs/test_errorlistener.py

@@ -59,7 +59,7 @@ def compile_source(self, source):
         errorlistener = ErrorListenerTest.MyErrorListener()
         try:
             source.Compile(errorlistener)
-        except System.Exception, e:
+        except System.Exception as e:
             pass
         return errorlistener.errors
 
@@ -76,18 +76,18 @@ def test_empty(self):
 
     def test_unexpected_token(self):
         expected = [
-            ("unexpected token 'foo'", "foo", 16, self.FatalError)
+            ("invalid syntax", "foo", 16, self.FatalError)
         ]
         actual = self.compile_expression("1.foo")
         self.assertEqual(expected, actual)
 
     def test_multiple_errors(self):
         expected = [
-            ("unexpected token 'print'", "print", 16, self.FatalError),
-            ("EOL while scanning single-quoted string", '"hello', 16, self.FatalError),
-            ("unexpected token 'print'", "print", 16, self.FatalError),
+            ("invalid syntax", "assert", 16, self.FatalError),
+            ("EOL while scanning string literal", '"hello', 16, self.FatalError),
+            ("invalid syntax", "assert", 16, self.FatalError),
         ]
-        actual = self.compile_expression("""print "hello""")
+        actual = self.compile_expression("""assert "hello""")
         self.assertEqual(expected, actual)
 
     def test_not_indented_class(self):
@@ -120,15 +120,15 @@ def test_non_fatal_error(self):
 
     def test_assignment_to_none(self):
         expected = [
-            ("cannot assign to None", "None", 80, self.FatalError),
+            ("can't assign to keyword", "None", 80, self.FatalError),
         ]
         actual = self.compile_file("None = 42")
         self.assertEqual(expected, actual)
 
     def test_multiple_erroneous_statements(self):
         expected = [
-            ("cannot assign to None", "None", 80, self.FatalError),
-            ("cannot assign to None", "None", 80, self.FatalError),
+            ("can't assign to keyword", "None", 80, self.FatalError),
+            ("can't assign to keyword", "None", 80, self.FatalError),
         ]
         code = """\
 None = 2
@@ -137,7 +137,7 @@ def test_multiple_erroneous_statements(self):
 
     def test_warning(self):
         expected = [
-            ("name 'a' is assigned to before global declaration", "global a", -1, self.Warning),
+            ("name 'a' is assigned to before global declaration", "global a", -1, self.FatalError), # reports as error since 3.6
         ]
         code = """\
 def foo():
@@ -164,7 +164,7 @@ def bar():
     def test_should_report_both_errors_and_warnings_negative(self):
         "Bug #17541, http://www.codeplex.com/IronPython/WorkItem/View.aspx?WorkItemId=17541"
         expected = [
-            ("cannot assign to None", "None", -1, self.Error),
+            ("can't assign to keyword", "None", -1, self.Error),
             ("Variable a assigned before global declaration", "global a", -1, self.Warning),
         ]
         code = """\
@@ -176,7 +176,7 @@ def foo():
 
     def test_all_together(self):
         expected = [
-            ('cannot assign to None', 'None', 80, self.FatalError),
+            ("can't assign to keyword", "None", 80, self.FatalError),
         ]
         code = """\
 None = 2

Tests/hosting/editor_svcs/test_tokencategorizer.py

@@ -4,7 +4,6 @@
 
 import unittest
 
-
 from iptest import IronPythonTestCase, run_test, skipUnlessIronPython
 
 # from System import Enum
@@ -14,13 +13,14 @@
 
 def pt(tokens):
     from Microsoft.Scripting import TokenTriggers
+    TokenTriggersNone = getattr(TokenTriggers, "None")
     for token in tokens:
-        print "t.%s(From(%d,%d,%d), To(%d,%d,%d)%s)," % \
+        print("t.%s(From(%d,%d,%d), To(%d,%d,%d)%s)," % \
         (token.Category.ToString(), token.SourceSpan.Start.Index,
         token.SourceSpan.Start.Line, token.SourceSpan.Start.Column,
         token.SourceSpan.End.Index, token.SourceSpan.End.Line,
         token.SourceSpan.End.Column,
-        "" if token.Trigger == TokenTriggers.None else token.Trigger)
+        "" if token.Trigger == TokenTriggersNone else token.Trigger))
 
 def get_tokens(engine, src, charcount = -1):
     from Microsoft.Scripting import SourceLocation
@@ -36,10 +36,12 @@ class TokenBuilder(object):
     def __getattr__(self, name):
         def callable(*args):
             from Microsoft.Scripting import SourceSpan, TokenCategory, TokenInfo, TokenTriggers
+            TokenTriggersNone = getattr(TokenTriggers, "None")
+            TokenCategoryNone = getattr(TokenCategory, "None")
             from System import Enum
-            triggers = args[2] if len(args)>2  else TokenTriggers.None
+            triggers = args[2] if len(args)>2  else TokenTriggersNone
             return TokenInfo(SourceSpan(args[0], args[1]),
-                    Enum.Parse(TokenCategory.None.GetType(), name), triggers)
+                    Enum.Parse(TokenCategoryNone.GetType(), name), triggers)
         return callable
 
 @skipUnlessIronPython()
@@ -56,7 +58,7 @@ def setUp(self):
 
     def test_categorizer_print(self):
         expected = [
-            self.t.Keyword(self.From(0,1,1), self.To(5,1,6)),
+            self.t.Identifier(self.From(0,1,1), self.To(5,1,6)),
             self.t.StringLiteral(self.From(6,1,7), self.To(11,1,12)),
             self.t.Comment(self.From(12,1,13), self.To(20,1,21)),
         ]
@@ -78,7 +80,7 @@ def test_categorizer_for_loop(self):
             self.t.Delimiter(self.From(27,1,28), self.To(28,1,29)),
             self.t.WhiteSpace(self.From(28,1,29), self.To(33,2,5)),
             self.t.Operator(self.From(28,1,29), self.To(33,2,5)),
-            self.t.Keyword(self.From(33,2,5), self.To(38,2,10)),
+            self.t.Identifier(self.From(33,2,5), self.To(38,2,10)),
             self.t.Identifier(self.From(39,2,11), self.To(43,2,15)),
             self.t.Delimiter(self.From(43,2,15), self.To(44,2,16), TokenTriggers.ParameterNext)
         ]
@@ -166,7 +168,7 @@ def test_categorizer_dict(self):
     def test_categorizer_if_else(self):
         expected = [
             self.t.Keyword(self.From(0,1,1), self.To(2,1,3)),
-            self.t.Identifier(self.From(3,1,4), self.To(7,1,8)),
+            self.t.Keyword(self.From(3,1,4), self.To(7,1,8)),
             self.t.Delimiter(self.From(7,1,8), self.To(8,1,9)),
             self.t.WhiteSpace(self.From(8,1,9), self.To(13,2,5)),
             self.t.Operator(self.From(8,1,9), self.To(13,2,5)),

Tests/interop/net/field/test_field_misc.py

@@ -1,6 +1,7 @@
 # Licensed to the .NET Foundation under one or more agreements.
 # The .NET Foundation licenses this file to you under the Apache 2.0 License.
 # See the LICENSE file in the project root for more information.
+
 '''
 Operations on enum type and its' members
 '''
@@ -21,14 +22,18 @@ def test_accessibility(self):
         o = Misc()
         o.Set()
         self.assertEqual(o.PublicField, 100)
-        self.assertTrue(not hasattr(o, 'ProtectedField'))
-        self.assertRaisesRegex(AttributeError, "'Misc' object has no attribute 'PrivateField'", lambda: o.PrivateField)
+        self.assertIn('ProtectedField', dir(o))
+        with self.assertRaises(TypeError):
+            hasattr(o, 'ProtectedField')
+        self.assertRaisesRegexp(AttributeError, "'Misc' object has no attribute 'PrivateField'", lambda: o.PrivateField)
         self.assertEqual(o.InterfaceField.PublicStaticField, 500)
 
         o = DerivedMisc()
         o.Set()
         self.assertEqual(o.PublicField, 400)
-        self.assertTrue(not hasattr(o, 'ProtectedField'))
+        self.assertIn('ProtectedField', dir(o))
+        with self.assertRaises(TypeError):
+            hasattr(o, 'ProtectedField')
 
 run_test(__name__)
 

Tests/interop/net/test_accessibility.py

@@ -1,6 +1,7 @@
 # Licensed to the .NET Foundation under one or more agreements.
 # The .NET Foundation licenses this file to you under the Apache 2.0 License.
 # See the LICENSE file in the project root for more information.
+
 '''
 NOTES:
 - needs to be rewritten
@@ -19,8 +20,8 @@ def setUp(self):
     def pass_for_read_protected(self, x):
         x.protected_static_field
         x.protected_static_method
-        #x.protected_static_property  # bug 370438
-        #x.protected_static_event     # bug 370432
+        x.protected_static_property  # bug 370438
+        x.protected_static_event     # bug 370432
         if str(x).startswith("<C1 object") or str(x).startswith("<C2 object"):
             print("Skipping (https://github.com/IronLanguages/main/issues/721)...")
         else:
@@ -39,8 +40,8 @@ def all_read(self, x):
         self.assertRaises(AttributeError, lambda: x.internal_static_nestedclass)
         x.protected_static_field
         x.protected_static_method
-        #x.protected_static_property  # bug 370438
-        #x.protected_static_event     # bug 370432
+        x.protected_static_property  # bug 370438
+        x.protected_static_event     # bug 370432
         self.assertTrue(not hasattr('x', 'protected_static_nestedclass')) # not supported
         x.public_static_field
         x.public_static_method
@@ -61,7 +62,7 @@ def all_read(self, x):
         x.protected_instance_field
         x.protected_instance_method
         x.protected_instance_property
-        #x.protected_instance_event     # bug 370432
+        x.protected_instance_event     # bug 370432
         self.assertTrue(not hasattr('x', 'protected_instance_nestedclass')) # not supported
         x.public_instance_field
         x.public_instance_method
@@ -166,7 +167,8 @@ def test_reflected_type(self):
             self.assertTrue('protected_static_field' in dir(C))
 
             x = C()
-            self.assertTrue(not hasattr(x, 'protected_instance_field'))
+            with self.assertRaises(TypeError):
+                hasattr(x, 'protected_instance_field')
             self.assertTrue('protected_instance_field' in dir(C))
             self.assertTrue('protected_instance_field' in dir(x))
             self.assertRaises(TypeError, lambda : x.protected_instance_field)

Tests/test_system_timers.py

@@ -44,7 +44,7 @@ def timer_helper(self, num_handlers=1, sleep_time=5, event_handlers=[], aTimer=N
 
         try:
             #create and run the timer
-            if aTimer==None:
+            if aTimer is None:
                 aTimer = System.Timers.Timer()
 
             for i in range(num_handlers): aTimer.Elapsed += System.Timers.ElapsedEventHandler(onTimedEvent)
@@ -89,8 +89,6 @@ def test_multiple_events_one_timer(self):
         '''
         Multiple event handlers hooked up to a single Timer object
         '''
-        global COUNT
-        COUNT=0
         self.timer_helper(num_handlers=5)
         self.timer_helper(num_handlers=500)