Allow input-based tests again in linkable

integration/test_constructors_al_linkable.py

@@ -111,23 +111,6 @@ class TestConstructorsActionLanguageLinkable(unittest.TestCase):
         commands = extend_commands(commands)
         self.assertTrue(run_barebone(commands, [None], None, timeout=True, link=["test.o"]))
 
-    """
-    def test_constructors_addition(self):
-        commands = [('"output"',
-                        ('"call"',
-                            ('"deref"', '"primitives/integer_addition"'),
-                            '2',
-                            ('"const"', '1'),
-                            ('"const"', '5'),
-                            'false',
-                        ),
-                        'true',
-                        ('"return"', 'true', '"const"', 'true'),
-                    )
-                ]
-        self.assertTrue(run_barebone(flatten(commands), ["6"], 1))
-    """
-
     def test_constructors_while_false(self):
         commands = [
                         '"while"',                 # While
@@ -186,7 +169,6 @@ class TestConstructorsActionLanguageLinkable(unittest.TestCase):
         commands = extend_commands(commands)
         self.assertTrue(run_barebone(commands, ["5"], None, link=["test.o"]))
 
-    """
     def test_constructors_output_input(self):
         commands = [
                      '"output"',
@@ -198,8 +180,9 @@ class TestConstructorsActionLanguageLinkable(unittest.TestCase):
                     'false',
                 ]
         commands = extend_commands(commands)
-        self.assertTrue(run_barebone(commands + ['123456'], ["123456"], None, link=["test.o"]))
+        self.assertTrue(run_barebone(commands, ["123456"], None, link=["test.o"], inputs=["123456"]))
 
+    """
     def test_constructors_funcdecl(self):
         commands = ['"declare"',
                         1,

integration/utils.py

@@ -181,7 +181,7 @@ def run_file(files, parameters, expected, mode):
         except UnboundLocalError:
             pass
             
-def run_barebone(parameters, expected, interface="0", timeout=False, wait=False, link=None):
+def run_barebone(parameters, expected, interface="0", timeout=False, wait=False, link=None, inputs=[]):
     port = getFreePort()
     address = "http://localhost:%i" % port
     try:
@@ -247,6 +247,9 @@ def run_barebone(parameters, expected, interface="0", timeout=False, wait=False,
                     print("Linking timeout expired!")
                     return False
 
+        for inp in inputs:
+            urllib2.urlopen(urllib2.Request(address, urllib.urlencode({"op": "set_input", "element_type": "V", "value": inp, "username": username})), timeout=1).read()
+
         counter = 0
         for e in expected:
             print("Expect " + str(e))