Manually merge migrid-sync PR61 back through trunk/master in line with current clunky code flow. Thanks, @albu.diku .

git-svn-id: svn+ssh://svn.code.sf.net/p/migrid/code/trunk@6049 b75ad72c-e7d7-11dd-a971-7dbc132099af

Author: jonasbardino

envhelp/python2

@@ -16,6 +16,10 @@ if [ -z "${DOCKER_BIN}" ]; then
     exit 1
 fi
 
+# default PYTHONPATH such that directly executing files in the repo "just works"
+# NOTE: this is hard-coded to the mount point used within the container
+PYTHONPATH='/usr/app/src'
+
 # default any variables for local development
 MIG_ENV=${MIG_ENV:-'local'}
 
@@ -40,4 +44,8 @@ echo
 
 # execute python2 within the image passing the supplied arguments
 
-${DOCKER_BIN} run -it --rm --mount type=bind,source=.,target=/usr/src/app --env "MIG_ENV=$MIG_ENV" "$IMAGEID" python2 "$@"
+${DOCKER_BIN} run -it --rm \
+    --mount type=bind,source=.,target=/usr/src/app \
+    --env "PYTHONPATH=$PYTHON_PATH" \
+    --env "MIG_ENV=$MIG_ENV" \
+    "$IMAGEID" python2 "$@"

envhelp/python3

@@ -6,17 +6,21 @@ set -e
 
 SCRIPT_PATH=$(realpath "$0")
 SCRIPT_BASE=$(dirname -- "$SCRIPT_PATH")
+MIG_BASE=$(realpath "$SCRIPT_BASE/..")
 PYTHON3_BIN="$SCRIPT_BASE/venv/bin/python3"
 
 if [ ! -f "${PYTHON3_BIN}" ]; then
     echo "No python3 binary found - perhaps the virtual env was not created"
     exit 1
 fi
 
+# default PYTHONPATH such that directly executing files in the repo "just works"
+PYTHONPATH=${PYTHONPATH:-"$MIG_BASE"}
+
 # default any variables for local development
 MIG_ENV=${MIG_ENV:-'local'}
 
 echo "running with MIG_ENV='$MIG_ENV' under python 3"
 echo
 
-MIG_ENV="$MIG_ENV" "$PYTHON3_BIN" "$@"
+PYTHONPATH="$PYTHONPATH" MIG_ENV="$MIG_ENV" "$PYTHON3_BIN" "$@"

tests/__init__.py

@@ -109,34 +109,34 @@ def test_store_bytes_at_offset(self):
             self.assertEqual(content[3:], DUMMY_BYTES)
 
     # TODO: enable again - requires the temporarily disabled auto mode select
-    # def test_store_bytes_in_text_mode(self):
-    #    fileio.write_chunk(self.tmp_path, DUMMY_BYTES, 0, self.logger,
-    #                       mode="r+")
-    #
-    #    with open(self.tmp_path, 'rb') as file:
-    #        content = file.read(1024)
-    #        self.assertEqual(len(content), DUMMY_BYTES_LENGTH)
-    #        self.assertEqual(content[:], DUMMY_BYTES)
+    def test_store_bytes_in_text_mode(self):
+        fileio.write_chunk(self.tmp_path, DUMMY_BYTES, 0, self.logger,
+                           mode="r+")
+
+        with open(self.tmp_path, 'rb') as file:
+            content = file.read(1024)
+            self.assertEqual(len(content), DUMMY_BYTES_LENGTH)
+            self.assertEqual(content[:], DUMMY_BYTES)
 
     # TODO: enable again - requires the temporarily disabled auto mode select
-    # def test_store_unicode(self):
-    #    fileio.write_chunk(self.tmp_path, DUMMY_UNICODE, 0, self.logger,
-    #                       mode='r+')
-    #
-    #    with open(self.tmp_path, 'r') as file:
-    #        content = file.read(1024)
-    #        self.assertEqual(len(content), DUMMY_UNICODE_LENGTH)
-    #        self.assertEqual(content[:], DUMMY_UNICODE)
+    def test_store_unicode(self):
+       fileio.write_chunk(self.tmp_path, DUMMY_UNICODE, 0, self.logger,
+                          mode='r+')
+    
+       with open(self.tmp_path, 'r') as file:
+           content = file.read(1024)
+           self.assertEqual(len(content), DUMMY_UNICODE_LENGTH)
+           self.assertEqual(content[:], DUMMY_UNICODE)
 
     # TODO: enable again - requires the temporarily disabled auto mode select
-    # def test_store_unicode_in_binary_mode(self):
-    #    fileio.write_chunk(self.tmp_path, DUMMY_UNICODE, 0, self.logger,
-    #                       mode='r+b')
-    #
-    #    with open(self.tmp_path, 'r') as file:
-    #        content = file.read(1024)
-    #        self.assertEqual(len(content), DUMMY_UNICODE_LENGTH)
-    #        self.assertEqual(content[:], DUMMY_UNICODE)
+    def test_store_unicode_in_binary_mode(self):
+       fileio.write_chunk(self.tmp_path, DUMMY_UNICODE, 0, self.logger,
+                          mode='r+b')
+    
+       with open(self.tmp_path, 'r') as file:
+           content = file.read(1024)
+           self.assertEqual(len(content), DUMMY_UNICODE_LENGTH)
+           self.assertEqual(content[:], DUMMY_UNICODE)
 
 
 class MigSharedFileio__write_file(MigTestCase):
@@ -185,37 +185,37 @@ def test_store_bytes(self):
             self.assertEqual(content[:], DUMMY_BYTES)
 
     # TODO: enable again - requires the temporarily disabled auto mode select
-    # def test_store_bytes_in_text_mode(self):
-    #    did_succeed = fileio.write_file(DUMMY_BYTES, self.tmp_path, self.logger,
-    #                                    mode="w")
-    #    self.assertTrue(did_succeed)
-    #
-    #    with open(self.tmp_path, 'rb') as file:
-    #        content = file.read(1024)
-    #        self.assertEqual(len(content), DUMMY_BYTES_LENGTH)
-    #        self.assertEqual(content[:], DUMMY_BYTES)
+    def test_store_bytes_in_text_mode(self):
+       did_succeed = fileio.write_file(DUMMY_BYTES, self.tmp_path, self.logger,
+                                       mode="w")
+       self.assertTrue(did_succeed)
+    
+       with open(self.tmp_path, 'rb') as file:
+           content = file.read(1024)
+           self.assertEqual(len(content), DUMMY_BYTES_LENGTH)
+           self.assertEqual(content[:], DUMMY_BYTES)
 
     # TODO: enable again - requires the temporarily disabled auto mode select
-    # def test_store_unicode(self):
-    #    did_succeed = fileio.write_file(DUMMY_UNICODE, self.tmp_path,
-    #                                    self.logger, mode='w')
-    #    self.assertTrue(did_succeed)
-    #
-    #    with open(self.tmp_path, 'r') as file:
-    #        content = file.read(1024)
-    #        self.assertEqual(len(content), DUMMY_UNICODE_LENGTH)
-    #        self.assertEqual(content[:], DUMMY_UNICODE)
+    def test_store_unicode(self):
+       did_succeed = fileio.write_file(DUMMY_UNICODE, self.tmp_path,
+                                       self.logger, mode='w')
+       self.assertTrue(did_succeed)
+    
+       with open(self.tmp_path, 'r') as file:
+           content = file.read(1024)
+           self.assertEqual(len(content), DUMMY_UNICODE_LENGTH)
+           self.assertEqual(content[:], DUMMY_UNICODE)
 
     # TODO: enable again - requires the temporarily disabled auto mode select
-    # def test_store_unicode_in_binary_mode(self):
-    #    did_succeed = fileio.write_file(DUMMY_UNICODE, self.tmp_path,
-    #                                    self.logger, mode='wb')
-    #    self.assertTrue(did_succeed)
-    #
-    #    with open(self.tmp_path, 'r') as file:
-    #        content = file.read(1024)
-    #        self.assertEqual(len(content), DUMMY_UNICODE_LENGTH)
-    #        self.assertEqual(content[:], DUMMY_UNICODE)
+    def test_store_unicode_in_binary_mode(self):
+       did_succeed = fileio.write_file(DUMMY_UNICODE, self.tmp_path,
+                                       self.logger, mode='wb')
+       self.assertTrue(did_succeed)
+    
+       with open(self.tmp_path, 'r') as file:
+           content = file.read(1024)
+           self.assertEqual(len(content), DUMMY_UNICODE_LENGTH)
+           self.assertEqual(content[:], DUMMY_UNICODE)
 
 
 if __name__ == '__main__':