pygolang: v↑ 0.1-69-g044deb35 -> 0.1-77-g9434cf0

And revert "software/slapos-testing: Quickfix python -E errors" now
that pygolang's pymain supports -E option.

This reverts commit 0fad9a6d.

component/pygolang/buildout.cfg

@@ -31,9 +31,9 @@ exe     = ${buildout:bin-directory}/gpython
 
 [pygolang-repository]
 recipe  = slapos.recipe.build:gitclone
-repository = https://lab.nexedi.com/nexedi/pygolang.git
+repository = https://lab.nexedi.com/nexedi/pygolang
 branch   = master
-revision = pygolang-0.1-69-g044deb35
+revision = pygolang-0.1-77-g9434cf0
 location = ${buildout:parts-directory}/pygolang
 git-executable = ${git:location}/bin/git
 

software/slapos-testing/buildout.hash.cfg

@@ -15,4 +15,4 @@
 
 [template]
 filename = instance.cfg
-md5sum = 9493b2789de783c375920eec74252499
+md5sum = 5f5378550470b551d280dd432878a0ba

software/slapos-testing/instance.cfg

@@ -102,17 +102,6 @@ template = inline:#!/bin/sh
   python -m unittest discover -v
 rendered = $${re6stnet:location}/test-runner.sh
 
-# XXX: Quick fix for tests failing due to python -E unknown option.
-# When gpython:main supports -E, move back to using that instead.
-[real-python-with-eggs]
-recipe = slapos.recipe.template
-inline =
-  #!/bin/sh
-  export PYTHONPATH=$(python -c "import sys; print(':'.join(p for p in sys.path if p))")
-  python=$(python -c "import sys; print(sys._gpy_underlying_executable)")
-  exec $python "$@"
-output = $${buildout:bin-directory}/$${:_buildout_section_name_}
-
 [slapos-test-runner-nxdtest-environment.sh]
 recipe = slapos.recipe.template
 output = $${create-directory:etc}/$${:_buildout_section_name_}
@@ -182,9 +171,9 @@ inline =
   )
   TestCase(
       "slapos.recipe.template",
-      # ['$${real-python-with-eggs:output}', '-m', 'unittest', 'slapos.recipe.template.tests.test_suite'],
+      # ['python', '-m', 'unittest', 'slapos.recipe.template.tests.test_suite'],
       # XXX some test fail when running with unittest, so we keep using setup.py test
-      ['$${real-python-with-eggs:output}', 'setup.py', 'test'],
+      ['python', 'setup.py', 'test'],
       cwd="""$${slapos.recipe.template:location}""",
       summaryf=UnitTest.summary,
   )
@@ -216,7 +205,7 @@ inline =
   )
   TestCase(
       "slapos.rebootstrap",
-      ['$${real-python-with-eggs:output}', '-m', 'unittest', '-v', 'slapos.rebootstrap.tests.test_suite'],
+      ['python', '-m', 'unittest', '-v', 'slapos.rebootstrap.tests.test_suite'],
       cwd="""$${slapos.rebootstrap:location}""",
       summaryf=UnitTest.summary,
   )