Branch '389-ds-base-1.3.4' - dirsrvtests/tests

[Mark Reynolds]

dirsrvtests/tests/tickets/ticket48497_test.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c6ebe12e937c10774ef066b1a6c07a36c16d69ce
Author: Mark Reynolds 
Date:   Tue May 10 14:45:52 2016 -0400

Ticket 48497 - uncomment pytest from CI test

Description:  For some reason "import pytest" was commented out - this
                  broke the tests.

https://fedorahosted.org/389/ticket/48497

Reviewed by: mreynolds (1 line commit rule)

(cherry picked from commit 6575db8af1a6d44a0fd9c8cf8e27ca0950a97faf)

diff --git a/dirsrvtests/tests/tickets/ticket48497_test.py b/dirsrvtests/tests/tickets/ticket48497_test.py
index dd02f4c..f82e842 100644
--- a/dirsrvtests/tests/tickets/ticket48497_test.py
+++ b/dirsrvtests/tests/tickets/ticket48497_test.py
@@ -3,7 +3,7 @@ import sys
 import time
 import ldap
 import logging
-#import pytest
+import pytest
 from lib389 import DirSrv, Entry, tools, tasks
 from lib389.tools import DirSrvTools
 from lib389._constants import *
@@ -174,4 +174,4 @@ if __name__ == '__main__':
 #     test_ticket48497_homeDirectory_index_run(topo)

CURRENT_FILE = os.path.realpath(__file__)
-    pytest.main("-s %s" % CURRENT_FILE)
\ No newline at end of file
+    pytest.main("-s %s" % CURRENT_FILE)