Fixed preview test error about os.getcwd()

once using os.getcwd() commond in the test case, it will report the below error: FIXTURES_DIR = os.path.join(os.getcwd(), 'tests/request_fixtures')
OSError: [Errno 2] No such file or directory
Find a substitutional method to get current working directory.

Change-Id: Ib313f51e8ce9770d67186554e397fb0a82c49fc8

diff --git a/tests/test_addfiles.py b/tests/test_addfiles.py
index ff44ee3fe2e1a19ae42b5e67082c8d4997c96187..a9b5f87fcb026b9988eee615ebeb40ddfa67b200 100644 (file)
--- a/tests/test_addfiles.py
+++ b/tests/test_addfiles.py
@@ -4,8 +4,8 @@ import os
 import sys
 from common import OscTestCase
 
-FIXTURES_DIR = os.path.join(os.getcwd(), 'tests/addfile_fixtures')
-
+#FIXTURES_DIR = os.path.join(os.getcwd(), 'addfile_fixtures')
+FIXTURES_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'addfile_fixtures')
 def suite():
     import unittest
     return unittest.makeSuite(TestAddFiles)

diff --git a/tests/test_commit.py b/tests/test_commit.py
index dce58bc6ec528db354144cb9157142a5b8bfd9a3..2636fcae71faf580fac0acc4fa7983af745bc36e 100644 (file)
--- a/tests/test_commit.py
+++ b/tests/test_commit.py
@@ -5,7 +5,8 @@ import sys
 import urllib2
 from common import GET, PUT, POST, DELETE, OscTestCase
 from xml.etree import cElementTree as ET
-FIXTURES_DIR = os.path.join(os.getcwd(), 'tests/commit_fixtures')
+#FIXTURES_DIR = os.path.join(os.getcwd(), 'commit_fixtures')
+FIXTURES_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'commit_fixtures')
 
 def suite():
     import unittest

diff --git a/tests/test_conf.py b/tests/test_conf.py
index de45887979da202bc5a493afba84c434b7f6a502..b90f00fd8b32a9398da8b24718f7f71b9bc26504 100644 (file)
--- a/tests/test_conf.py
+++ b/tests/test_conf.py
@@ -3,8 +3,8 @@ from common import OscTestCase
 
 import os
 
-FIXTURES_DIR = os.path.join(os.getcwd(), 'tests/conf_fixtures')
-
+#FIXTURES_DIR = os.path.join(os.getcwd(), 'conf_fixtures')
+FIXTURES_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'conf_fixtures')
 def suite():
     import unittest
     return unittest.makeSuite(TestConf)

diff --git a/tests/test_deletefiles.py b/tests/test_deletefiles.py
index ae1bbda1582ef5174cc73027024225fd153da715..900f35c810d2bf4eb377430fe9fbbcccec24768c 100644 (file)
--- a/tests/test_deletefiles.py
+++ b/tests/test_deletefiles.py
@@ -3,7 +3,8 @@ import osc.oscerr
 import os
 from common import OscTestCase
 
-FIXTURES_DIR = os.path.join(os.getcwd(), 'tests/deletefile_fixtures')
+#FIXTURES_DIR = os.path.join(os.getcwd(), 'deletefile_fixtures')
+FIXTURES_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'deletefile_fixtures')
 
 def suite():
     import unittest

diff --git a/tests/test_difffiles.py b/tests/test_difffiles.py
index 80697be6936f116db1c80812b8ed543d2bc08d39..6d29050fe459d07baaf8403ccca4ab89513c3150 100644 (file)
--- a/tests/test_difffiles.py
+++ b/tests/test_difffiles.py
@@ -4,8 +4,8 @@ import os
 import re
 from common import GET, OscTestCase
 
-FIXTURES_DIR = os.path.join(os.getcwd(), 'tests/difffile_fixtures')
-
+#FIXTURES_DIR = os.path.join(os.getcwd(), 'difffile_fixtures')
+FIXTURES_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'difffile_fixtures')
 def suite():
     import unittest
     return unittest.makeSuite(TestDiffFiles)

diff --git a/tests/test_init_package.py b/tests/test_init_package.py
index 47dfec72699ac59de03cd22bd681deef32487063..d1a43ef4ff4c072d2745167b5f0c989292f82dac 100644 (file)
--- a/tests/test_init_package.py
+++ b/tests/test_init_package.py
@@ -2,7 +2,8 @@ import osc.core
 import osc.oscerr
 import os
 from common import OscTestCase
-FIXTURES_DIR = os.path.join(os.getcwd(), 'tests/init_package_fixtures')
+#FIXTURES_DIR = os.path.join(os.getcwd(), 'init_package_fixtures')
+FIXTURES_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'init_package_fixtures')
 
 def suite():
     import unittest

diff --git a/tests/test_init_project.py b/tests/test_init_project.py
index f91196c1f0bb02be8f56824ac23e47c2a4ee071c..fcaabdc04983b4bf6f384e0b0cf32412a17c5620 100644 (file)
--- a/tests/test_init_project.py
+++ b/tests/test_init_project.py
@@ -2,7 +2,9 @@ import osc.core
 import osc.oscerr
 import os
 from common import GET, OscTestCase
-FIXTURES_DIR = os.path.join(os.getcwd(), 'tests/init_project_fixtures')
+
+#FIXTURES_DIR = os.path.join(os.getcwd(), 'init_project_fixtures')
+FIXTURES_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'init_project_fixtures')
 
 def suite():
     import unittest

diff --git a/tests/test_package_status.py b/tests/test_package_status.py
index 7b4a71edb6902b61ec85c7693c734839defa7645..7b0e7d30fa5b326539a3da08c749486439f97555 100644 (file)
--- a/tests/test_package_status.py
+++ b/tests/test_package_status.py
@@ -3,8 +3,8 @@ import osc.oscerr
 import os
 from common import OscTestCase
 
-FIXTURES_DIR = os.path.join(os.getcwd(), 'tests/project_package_status_fixtures')
-
+#FIXTURES_DIR = os.path.join(os.getcwd(), 'project_package_status_fixtures')
+FIXTURES_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'project_package_status_fixtures')
 def suite():
     import unittest
     return unittest.makeSuite(TestPackageStatus)

diff --git a/tests/test_prdiff.py b/tests/test_prdiff.py
index 766271dd39fd8ebdd0a1e1d4ac348f1609610809..13e156a28cdfeaf8de67d914385ee6747f32fa6e 100644 (file)
--- a/tests/test_prdiff.py
+++ b/tests/test_prdiff.py
@@ -7,7 +7,9 @@ import sys
 from common import GET, POST, OscTestCase, addExpectedRequest, EXPECTED_REQUESTS
 
 
-FIXTURES_DIR = os.path.join(os.getcwd(), 'tests/prdiff_fixtures')
+#FIXTURES_DIR = os.path.join(os.getcwd(), 'prdiff_fixtures')
+FIXTURES_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'prdiff_fixtures')
+
 API_URL  = 'http://localhost/'
 UPSTREAM = 'some:project'
 BRANCH   = 'home:user:branches:' + UPSTREAM

diff --git a/tests/test_project_status.py b/tests/test_project_status.py
index 88118a265be93ddf7a4e946a9c4406a33b281cc1..58feae71630e6646049d0c6d8c6f769afe79cb57 100644 (file)
--- a/tests/test_project_status.py
+++ b/tests/test_project_status.py
@@ -3,7 +3,8 @@ import osc.oscerr
 import os
 from common import OscTestCase
 
-FIXTURES_DIR = os.path.join(os.getcwd(), 'tests/project_package_status_fixtures')
+#FIXTURES_DIR = os.path.join(os.getcwd(), 'project_package_status_fixtures')
+FIXTURES_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'project_package_status_fixtures')
 
 def suite():
     import unittest

diff --git a/tests/test_repairwc.py b/tests/test_repairwc.py
index 6b8fd6e862b1f0f092f7f714dcc41bec3e029a9d..a7735c0dde6c8cbd4ecc7026d168b2f95849f011 100644 (file)
--- a/tests/test_repairwc.py
+++ b/tests/test_repairwc.py
@@ -4,7 +4,8 @@ import os
 import sys
 from common import GET, PUT, POST, DELETE, OscTestCase
 from xml.etree import cElementTree as ET
-FIXTURES_DIR = os.path.join(os.getcwd(), 'tests/repairwc_fixtures')
+#FIXTURES_DIR = os.path.join(os.getcwd(), 'repairwc_fixtures')
+FIXTURES_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'repairwc_fixtures')
 
 def suite():
     import unittest

diff --git a/tests/test_request.py b/tests/test_request.py
index 4334cffc8daf39c01ccc99c0186c14cc7aec662c..8f06edb91ae2f015dbf72e08d626084f0ca34df2 100644 (file)
--- a/tests/test_request.py
+++ b/tests/test_request.py
@@ -3,7 +3,8 @@ import osc.oscerr
 import os
 from common import OscTestCase
 
-FIXTURES_DIR = os.path.join(os.getcwd(), 'tests/request_fixtures')
+#FIXTURES_DIR = os.path.join(os.getcwd(), 'request_fixtures')
+FIXTURES_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'request_fixtures')
 
 def suite():
     import unittest

diff --git a/tests/test_revertfiles.py b/tests/test_revertfiles.py
index b62cb51afc5fdfb6e00f5872ab6cf6ba9ad9a4be..c68d69ae92d39aee65459cc8f29ac64588fead75 100644 (file)
--- a/tests/test_revertfiles.py
+++ b/tests/test_revertfiles.py
@@ -3,7 +3,8 @@ import osc.oscerr
 import os
 from common import OscTestCase
 
-FIXTURES_DIR = os.path.join(os.getcwd(), 'tests/revertfile_fixtures')
+#FIXTURES_DIR = os.path.join(os.getcwd(), 'revertfile_fixtures')
+FIXTURES_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'revertfile_fixtures')
 
 def suite():
     import unittest

diff --git a/tests/test_setlinkrev.py b/tests/test_setlinkrev.py
index 5f2ef65bca201c25584babcf1eb80b84f07e91a3..6d097122d49cc7fa06c2f3337af03e8a00b7d8b1 100644 (file)
--- a/tests/test_setlinkrev.py
+++ b/tests/test_setlinkrev.py
@@ -2,7 +2,8 @@ import osc.core
 import osc.oscerr
 import os
 from common import GET, PUT, OscTestCase
-FIXTURES_DIR = os.path.join(os.getcwd(), 'tests/setlinkrev_fixtures')
+#FIXTURES_DIR = os.path.join(os.getcwd(), 'setlinkrev_fixtures')
+FIXTURES_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'setlinkrev_fixtures')
 
 def suite():
     import unittest

diff --git a/tests/test_update.py b/tests/test_update.py
index d58cf483df3445eebeed0c481ba3935c82bd6544..8a3a0e2baac5723d8a28af3d2193670376c14284 100644 (file)
--- a/tests/test_update.py
+++ b/tests/test_update.py
@@ -3,7 +3,9 @@ import osc.oscerr
 import os
 import sys
 from common import GET, OscTestCase
-FIXTURES_DIR = os.path.join(os.getcwd(), 'tests/update_fixtures')
+
+#FIXTURES_DIR = os.path.join(os.path.dirname(os.getcwd(), 'update_fixtures')
+FIXTURES_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'update_fixtures')
 
 def suite():
     import unittest