Avoid test interdependency

amos402 · amos402 · commit af33e749d16f · 2018-06-24T15:40:14.000+08:00
diff --git a/src/embed_tests/TestPyScope.cs b/src/embed_tests/TestPyScope.cs
@@ -293,24 +293,27 @@ public void TestImportScopeByName()
         [Test]
         public void TestVariables()
         {
-            (ps.Variables() as dynamic)["ee"] = new PyInt(200);
-            var a0 = ps.Get<int>("ee");
-            Assert.AreEqual(200, a0);
+            using (Py.GIL())
+            { 
+                (ps.Variables() as dynamic)["ee"] = new PyInt(200);
+                var a0 = ps.Get<int>("ee");
+                Assert.AreEqual(200, a0);
 
-            ps.Exec("locals()['ee'] = 210");
-            var a1 = ps.Get<int>("ee");
-            Assert.AreEqual(210, a1);
+                ps.Exec("locals()['ee'] = 210");
+                var a1 = ps.Get<int>("ee");
+                Assert.AreEqual(210, a1);
 
-            ps.Exec("globals()['ee'] = 220");
-            var a2 = ps.Get<int>("ee");
-            Assert.AreEqual(220, a2);
+                ps.Exec("globals()['ee'] = 220");
+                var a2 = ps.Get<int>("ee");
+                Assert.AreEqual(220, a2);
 
-            using (var item = ps.Variables())
-            {
-                item["ee"] = new PyInt(230);
+                using (var item = ps.Variables())
+                {
+                    item["ee"] = new PyInt(230);
+                }
+                var a3 = ps.Get<int>("ee");
+                Assert.AreEqual(230, a3);
             }
-            var a3 = ps.Get<int>("ee");
-            Assert.AreEqual(230, a3);
         }
 
         /// <summary>
@@ -324,49 +327,55 @@ public void TestThread()
             //should be removed.
             dynamic _ps = ps;
             var ts = PythonEngine.BeginAllowThreads();
-            using (Py.GIL())
-            {
-                _ps.res = 0;
-                _ps.bb = 100;
-                _ps.th_cnt = 0;
-                //add function to the scope 
-                //can be call many times, more efficient than ast 
-                ps.Exec(
-                    "def update():\n" +
-                    "    global res, th_cnt\n" +
-                    "    res += bb + 1\n" +
-                    "    th_cnt += 1\n"
-                );
-            }
-            int th_cnt = 3;
-            for (int i =0; i< th_cnt; i++)
+            try
             {
-                System.Threading.Thread th = new System.Threading.Thread(()=>
+                using (Py.GIL())
+                {
+                    _ps.res = 0;
+                    _ps.bb = 100;
+                    _ps.th_cnt = 0;
+                    //add function to the scope 
+                    //can be call many times, more efficient than ast 
+                    ps.Exec(
+                        "def update():\n" +
+                        "    global res, th_cnt\n" +
+                        "    res += bb + 1\n" +
+                        "    th_cnt += 1\n"
+                    );
+                }
+                int th_cnt = 3;
+                for (int i = 0; i < th_cnt; i++)
+                {
+                    System.Threading.Thread th = new System.Threading.Thread(() =>
+                    {
+                        using (Py.GIL())
+                        {
+                            //ps.GetVariable<dynamic>("update")(); //call the scope function dynamicly
+                            _ps.update();
+                        }
+                    });
+                    th.Start();
+                }
+                //equivalent to Thread.Join, make the main thread join the GIL competition
+                int cnt = 0;
+                while (cnt != th_cnt)
                 {
                     using (Py.GIL())
                     {
-                        //ps.GetVariable<dynamic>("update")(); //call the scope function dynamicly
-                        _ps.update();
+                        cnt = ps.Get<int>("th_cnt");
                     }
-                });
-                th.Start();
-            }
-            //equivalent to Thread.Join, make the main thread join the GIL competition
-            int cnt = 0;
-            while(cnt != th_cnt)
-            {
+                    System.Threading.Thread.Sleep(10);
+                }
                 using (Py.GIL())
                 {
-                    cnt = ps.Get<int>("th_cnt");
+                    var result = ps.Get<int>("res");
+                    Assert.AreEqual(101 * th_cnt, result);
                 }
-                System.Threading.Thread.Sleep(10);
             }
-            using (Py.GIL())
+            finally
             {
-                var result = ps.Get<int>("res");
-                Assert.AreEqual(101* th_cnt, result);
+                PythonEngine.EndAllowThreads(ts);
             }
-            PythonEngine.EndAllowThreads(ts);
         }
     }
 }
