diff options
| author | Victor Shyba <victor1984@riseup.net> | 2017-08-25 05:13:00 -0300 |
|---|---|---|
| committer | drebs <drebs@riseup.net> | 2017-09-05 11:08:47 -0300 |
| commit | f26c027f1db489018c724a192309b93a8d8357c0 (patch) | |
| tree | b79dc2d77fe5babe358731dbdb342a4a94236fcc | |
| parent | 451604cdbb93d738d29855fcc69f44b4ec996645 (diff) | |
[pkg] move server.tac to server src folder
This way the file gets copied during package install.
-- Related: #8867
| -rw-r--r-- | src/leap/soledad/server/server.tac (renamed from pkg/server.tac) | 0 | ||||
| -rw-r--r-- | testing/tests/server/test_tac.py | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/server.tac b/src/leap/soledad/server/server.tac index 1bc3dc69..1bc3dc69 100644 --- a/pkg/server.tac +++ b/src/leap/soledad/server/server.tac diff --git a/testing/tests/server/test_tac.py b/testing/tests/server/test_tac.py index 3fa4e064..e825a9ce 100644 --- a/testing/tests/server/test_tac.py +++ b/testing/tests/server/test_tac.py @@ -26,14 +26,14 @@ import socket import pytest import treq +from pkg_resources import resource_filename from twisted.trial import unittest from twisted.internet import defer, reactor from twisted.internet.protocol import ProcessProtocol from twisted.web.client import Agent -TAC_FILE_PATH = ('..', '..', '..', '..', 'pkg', 'server.tac') -TAC_FILE_PATH = os.path.abspath(os.path.join(__file__, *TAC_FILE_PATH)) +TAC_FILE_PATH = resource_filename('leap.soledad.server', 'server.tac') class TacServerTestCase(unittest.TestCase): |