[Reproducible-commits] [reprotest] 03/06: Rework sys.path mutations to work with reprotest/ and lib/ as packages

[Ceridwen]

This is an automated email from the git hooks/post-receive script.

ceridwen-guest pushed a commit to branch virtualization
in repository reprotest.

commit d188a2bf56c8534f7582096aad1d656e9d43a6b0
Author: Ceridwen <ceridwenv at gmail.com>
Date:   Mon Jun 20 21:40:10 2016 -0400

    Rework sys.path mutations to work with reprotest/ and lib/ as packages
---
 reprotest/virt/chroot  | 10 +++++-----
 reprotest/virt/lxc     | 10 +++++-----
 reprotest/virt/lxd     | 10 +++++-----
 reprotest/virt/null    | 10 +++++-----
 reprotest/virt/qemu    | 10 +++++-----
 reprotest/virt/schroot | 10 +++++-----
 reprotest/virt/ssh     | 10 +++++-----
 7 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/reprotest/virt/chroot b/reprotest/virt/chroot
index 6c2b460..8f3af3b 100755
--- a/reprotest/virt/chroot
+++ b/reprotest/virt/chroot
@@ -26,12 +26,12 @@ import sys
 import os
 import argparse
 
-sys.path.insert(0, '/usr/share/autopkgtest/python')
-sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(
-    os.path.abspath(__file__))), 'lib'))
 
-import VirtSubproc
-import adtlog
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(
+    os.path.abspath(__file__)))))
+
+from reprotest.lib import VirtSubproc
+from reprotest.lib import adtlog
 
 
 capabilities = []
diff --git a/reprotest/virt/lxc b/reprotest/virt/lxc
index 54b17af..5919eca 100755
--- a/reprotest/virt/lxc
+++ b/reprotest/virt/lxc
@@ -35,12 +35,12 @@ import tempfile
 import shutil
 import argparse
 
-sys.path.insert(0, '/usr/share/autopkgtest/python')
-sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(
-    os.path.abspath(__file__))), 'lib'))
 
-import VirtSubproc
-import adtlog
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(
+    os.path.abspath(__file__)))))
+
+from reprotest.lib import VirtSubproc
+from reprotest.lib import adtlog
 
 
 capabilities = ['revert', 'revert-full-system', 'root-on-testbed',
diff --git a/reprotest/virt/lxd b/reprotest/virt/lxd
index da32508..45ea67e 100755
--- a/reprotest/virt/lxd
+++ b/reprotest/virt/lxd
@@ -32,12 +32,12 @@ import subprocess
 import time
 import argparse
 
-sys.path.insert(0, '/usr/share/autopkgtest/python')
-sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(
-    os.path.abspath(__file__))), 'lib'))
 
-import VirtSubproc
-import adtlog
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(
+    os.path.abspath(__file__)))))
+
+from reprotest.lib import VirtSubproc
+from reprotest.lib import adtlog
 
 
 capabilities = ['revert', 'revert-full-system', 'root-on-testbed',
diff --git a/reprotest/virt/null b/reprotest/virt/null
index 3e6e80d..b23eb01 100755
--- a/reprotest/virt/null
+++ b/reprotest/virt/null
@@ -26,12 +26,12 @@ import sys
 import os
 import argparse
 
-sys.path.insert(0, '/usr/share/autopkgtest/python')
-sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(
-    os.path.abspath(__file__))), 'lib'))
 
-import VirtSubproc
-import adtlog
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(
+    os.path.abspath(__file__)))))
+
+from reprotest.lib import VirtSubproc
+from reprotest.lib import adtlog
 
 
 capabilities = ['isolation-machine']
diff --git a/reprotest/virt/qemu b/reprotest/virt/qemu
index 69ec5c5..2b49c93 100755
--- a/reprotest/virt/qemu
+++ b/reprotest/virt/qemu
@@ -37,12 +37,12 @@ import fcntl
 import re
 import argparse
 
-sys.path.insert(0, '/usr/share/autopkgtest/python')
-sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(
-    os.path.abspath(__file__))), 'lib'))
 
-import VirtSubproc
-import adtlog
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(
+    os.path.abspath(__file__)))))
+
+from reprotest.lib import VirtSubproc
+from reprotest.lib import adtlog
 
 
 args = None
diff --git a/reprotest/virt/schroot b/reprotest/virt/schroot
index de07c7d..c24e11d 100755
--- a/reprotest/virt/schroot
+++ b/reprotest/virt/schroot
@@ -31,12 +31,12 @@ import subprocess
 import time
 import argparse
 
-sys.path.insert(0, '/usr/share/autopkgtest/python')
-sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(
-    os.path.abspath(__file__))), 'lib'))
 
-import VirtSubproc
-import adtlog
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(
+    os.path.abspath(__file__)))))
+
+from reprotest.lib import VirtSubproc
+from reprotest.lib import adtlog
 
 
 capabilities = ['revert']
diff --git a/reprotest/virt/ssh b/reprotest/virt/ssh
index 36980fe..9d33bf0 100755
--- a/reprotest/virt/ssh
+++ b/reprotest/virt/ssh
@@ -36,12 +36,12 @@ import time
 import subprocess
 import socket
 
-sys.path.insert(0, '/usr/share/autopkgtest/python')
-sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(
-    os.path.abspath(__file__))), 'lib'))
 
-import VirtSubproc
-import adtlog
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(
+    os.path.abspath(__file__)))))
+
+from reprotest.lib import VirtSubproc
+from reprotest.lib import adtlog
 
 capabilities = []
 args = None

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/reprotest.git