From cd000871ac580308655a0ac21a3c0acf9ac6c512 Mon Sep 17 00:00:00 2001
From: Barbora Smejkalová <bsmejkal@redhat.com>
Date: May 16 2019 13:01:38 +0000
Subject: Issue 49029 - [RFE] improve internal operations logging


Description:
Edited the test cases by changing the 'op' number to regex, because the values were hardcoded into the test and if there was some more fixing of internal logs that would cause the 'op' number to raise up/lower down then the test would fail. The main goal is to check syntax of internal messages, not to match 'op' numbers.

Also changed strings in src/lib389/lib389/dirsrv_log.py to raw strings to stop showing warnings about deprecation.

https://pagure.io/389-ds-base/issue/49029

Reviewed by: vashirov (Thanks!)

---

diff --git a/dirsrvtests/tests/suites/ds_logs/ds_logs_test.py b/dirsrvtests/tests/suites/ds_logs/ds_logs_test.py
index 4d3dd59..e471ee5 100644
--- a/dirsrvtests/tests/suites/ds_logs/ds_logs_test.py
+++ b/dirsrvtests/tests/suites/ds_logs/ds_logs_test.py
@@ -297,16 +297,19 @@ def test_internal_log_server_level_0(topology_st):
     log.info('Restart the server to flush the logs')
     topo.restart()
 
-    # These comments contain lines we are trying to find without regex
+    # These comments contain lines we are trying to find without regex (the op numbers are just examples)
     log.info("Check if access log does not contain internal log of MOD operation")
     # (Internal) op=2(2)(1) SRCH base="cn=config
-    assert not topo.ds_access_log.match(r'.*\(Internal\) op=2\(2\)\(1\) SRCH base="cn=config.*')
+    assert not topo.ds_access_log.match(r'.*\(Internal\) op=[0-9]+\([0-9]+\)\([0-9]+\) SRCH base="cn=config.*')
     # (Internal) op=2(2)(1) RESULT err=0 tag=48 nentries=1
-    assert not topo.ds_access_log.match(r'.*\(Internal\) op=2\(2\)\(1\) RESULT err=0 tag=48 nentries=1.*')
+    assert not topo.ds_access_log.match(r'.*\(Internal\) op=[0-9]+\([0-9]+\)\([0-9]+\) RESULT err=0 tag=48 nentries=1.*')
 
     log.info("Check if the other internal operations are not present")
     # conn=Internal(0) op=0
-    assert not topo.ds_access_log.match(r'.*conn=Internal\(0\) op=0.*')
+    assert not topo.ds_access_log.match(r'.*conn=Internal\([0-9]+\) op=[0-9]+\([0-9]+\)\([0-9]+\).*')
+
+    log.info('Delete the previous access logs for the next test')
+    topo.deleteAccessLogs()
 
 
 @pytest.mark.bz1358706
@@ -344,16 +347,16 @@ def test_internal_log_server_level_4(topology_st):
     log.info('Restart the server to flush the logs')
     topo.restart()
 
-    # These comments contain lines we are trying to find without regex
+    # These comments contain lines we are trying to find without regex (the op numbers are just examples)
     log.info("Check if access log contains internal MOD operation in correct format")
     # (Internal) op=2(2)(1) SRCH base="cn=config
-    assert topo.ds_access_log.match(r'.*\(Internal\) op=2\(2\)\(1\) SRCH base="cn=config.*')
+    assert topo.ds_access_log.match(r'.*\(Internal\) op=[0-9]+\([0-9]+\)\([0-9]+\) SRCH base="cn=config.*')
     # (Internal) op=2(2)(1) RESULT err=0 tag=48 nentries=1
-    assert topo.ds_access_log.match(r'.*\(Internal\) op=2\(2\)\(1\) RESULT err=0 tag=48 nentries=1.*')
+    assert topo.ds_access_log.match(r'.*\(Internal\) op=[0-9]+\([0-9]+\)\([0-9]+\) RESULT err=0 tag=48 nentries=1.*')
 
     log.info("Check if the other internal operations have the correct format")
     # conn=Internal(0) op=0
-    assert topo.ds_access_log.match(r'.*conn=Internal\(0\) op=0.*')
+    assert topo.ds_access_log.match(r'.*conn=Internal\([0-9]+\) op=[0-9]+\([0-9]+\)\([0-9]+\).*')
 
     log.info('Delete the previous access logs for the next test')
     topo.deleteAccessLogs()
@@ -393,49 +396,50 @@ def test_internal_log_level_260(topology_st, add_user_log_level_260):
     log.info('Restart the server to flush the logs')
     topo.restart()
 
-    # These comments contain lines we are trying to find without regex
+    # These comments contain lines we are trying to find without regex (the op numbers are just examples)
     log.info("Check the access logs for ADD operation of the user")
     # op=10 ADD dn="uid=test_user_777,ou=branch1,dc=example,dc=com"
-    assert topo.ds_access_log.match(r'.*op=10 ADD dn="uid=test_user_777,ou=branch1,dc=example,dc=com".*')
+    assert topo.ds_access_log.match(r'.*op=[0-9]+ ADD dn="uid=test_user_777,ou=branch1,dc=example,dc=com".*')
     # (Internal) op=10(1)(1) MOD dn="cn=group,ou=Groups,dc=example,dc=com"
-    assert topo.ds_access_log.match(r'.*\(Internal\) op=10\(1\)\(1\) MOD dn="cn=group,ou=Groups,dc=example,dc=com".*')
+    assert topo.ds_access_log.match(r'.*\(Internal\) op=[0-9]+\([0-9]+\)\([0-9]+\) '
+                                    r'MOD dn="cn=group,ou=Groups,dc=example,dc=com".*')
     # (Internal) op=10(1)(2) SRCH base="cn=group,ou=Groups,dc=example,dc=com"
-    assert topo.ds_access_log.match(r'.*\(Internal\) op=10\(1\)\(2\) SRCH base="cn=group,'
+    assert topo.ds_access_log.match(r'.*\(Internal\) op=[0-9]+\([0-9]+\)\([0-9]+\) SRCH base="cn=group,'
                                     r'ou=Groups,dc=example,dc=com".*')
     # (Internal) op=10(1)(2) RESULT err=0 tag=48 nentries=1
-    assert topo.ds_access_log.match(r'.*\(Internal\) op=10\(1\)\(2\) RESULT err=0 tag=48 nentries=1*')
+    assert topo.ds_access_log.match(r'.*\(Internal\) op=[0-9]+\([0-9]+\)\([0-9]+\) RESULT err=0 tag=48 nentries=1*')
     # (Internal) op=10(1)(1) RESULT err=0 tag=48
-    assert topo.ds_access_log.match(r'.*\(Internal\) op=10\(1\)\(1\) RESULT err=0 tag=48.*')
+    assert topo.ds_access_log.match(r'.*\(Internal\) op=[0-9]+\([0-9]+\)\([0-9]+\) RESULT err=0 tag=48.*')
     # op=10 RESULT err=0 tag=105
-    assert topo.ds_access_log.match(r'.*op=10 RESULT err=0 tag=105.*')
+    assert topo.ds_access_log.match(r'.*op=[0-9]+ RESULT err=0 tag=105.*')
 
     log.info("Check the access logs for MOD operation of the user")
     # op=12 MODRDN dn="uid=test_user_777,ou=branch1,dc=example,dc=com" '
     #      'newrdn="uid=new_test_user_777" newsuperior="dc=example,dc=com"
-    assert topo.ds_access_log.match(r'.*op=12 MODRDN dn="uid=test_user_777,ou=branch1,dc=example,dc=com" '
+    assert topo.ds_access_log.match(r'.*op=[0-9]+ MODRDN dn="uid=test_user_777,ou=branch1,dc=example,dc=com" '
                                     'newrdn="uid=new_test_user_777" newsuperior="dc=example,dc=com".*')
     # (Internal) op=12(1)(1) SRCH base="uid=test_user_777, ou=branch1,dc=example,dc=com"
-    assert topo.ds_access_log.match(r'.*\(Internal\) op=12\(1\)\(1\) SRCH base="uid=test_user_777,'
+    assert topo.ds_access_log.match(r'.*\(Internal\) op=[0-9]+\([0-9]+\)\([0-9]+\) SRCH base="uid=test_user_777,'
                                     'ou=branch1,dc=example,dc=com".*')
     # (Internal) op=12(1)(1) RESULT err=0 tag=48 nentries=1
-    assert topo.ds_access_log.match(r'.*\(Internal\) op=12\(1\)\(1\) RESULT err=0 tag=48 nentries=1.*')
+    assert topo.ds_access_log.match(r'.*\(Internal\) op=[0-9]+\([0-9]+\)\([0-9]+\) RESULT err=0 tag=48 nentries=1.*')
     # op=12 RESULT err=0 tag=109
-    assert topo.ds_access_log.match(r'.*op=12 RESULT err=0 tag=109.*')
+    assert topo.ds_access_log.match(r'.*op=[0-9]+ RESULT err=0 tag=109.*')
 
     log.info("Check the access logs for DEL operation of the user")
     # op=15 DEL dn="uid=new_test_user_777,dc=example,dc=com"
-    assert topo.ds_access_log.match(r'.*op=15 DEL dn="uid=new_test_user_777,dc=example,dc=com".*')
+    assert topo.ds_access_log.match(r'.*op=[0-9]+ DEL dn="uid=new_test_user_777,dc=example,dc=com".*')
     # (Internal) op=15(1)(1) SRCH base="uid=new_test_user_777, dc=example,dc=com"
-    assert topo.ds_access_log.match(r'.*\(Internal\) op=15\(1\)\(1\) SRCH base="uid=new_test_user_777,'
+    assert topo.ds_access_log.match(r'.*\(Internal\) op=[0-9]+\([0-9]+\)\([0-9]+\) SRCH base="uid=new_test_user_777,'
                                     'dc=example,dc=com".*')
     # (Internal) op=15(1)(1) RESULT err=0 tag=48 nentries=1
-    assert topo.ds_access_log.match(r'.*\(Internal\) op=15\(1\)\(1\) RESULT err=0 tag=48 nentries=1.*')
+    assert topo.ds_access_log.match(r'.*\(Internal\) op=[0-9]+\([0-9]+\)\([0-9]+\) RESULT err=0 tag=48 nentries=1.*')
     # op=15 RESULT err=0 tag=107
-    assert topo.ds_access_log.match(r'.*op=15 RESULT err=0 tag=107.*')
+    assert topo.ds_access_log.match(r'.*op=[0-9]+ RESULT err=0 tag=107.*')
 
     log.info("Check if the other internal operations have the correct format")
     # conn=Internal(0) op=0
-    assert topo.ds_access_log.match(r'.*conn=Internal\(0\) op=0.*')
+    assert topo.ds_access_log.match(r'.*conn=Internal\([0-9]+\) op=[0-9]+\([0-9]+\)\([0-9]+\).*')
 
     log.info('Delete the previous access logs for the next test')
     topo.deleteAccessLogs()
@@ -476,48 +480,50 @@ def test_internal_log_level_131076(topology_st, add_user_log_level_131076):
     log.info('Restart the server to flush the logs')
     topo.restart()
 
-    # These comments contain lines we are trying to find without regex
+    # These comments contain lines we are trying to find without regex (the op numbers are just examples)
     log.info("Check the access logs for ADD operation of the user")
     # op=10 ADD dn="uid=test_user_777,ou=branch1,dc=example,dc=com"
-    assert not topo.ds_access_log.match(r'.*op=10 ADD dn="uid=test_user_777,ou=branch1,dc=example,dc=com".*')
+    assert not topo.ds_access_log.match(r'.*op=[0-9]+ ADD dn="uid=test_user_777,ou=branch1,dc=example,dc=com".*')
     # (Internal) op=10(1)(1) MOD dn="cn=group,ou=Groups,dc=example,dc=com"
-    assert topo.ds_access_log.match(r'.*\(Internal\) op=10\(1\)\(1\) MOD dn="cn=group,ou=Groups,dc=example,dc=com".*')
+    assert topo.ds_access_log.match(r'.*\(Internal\) op=[0-9]+\([0-9]+\)\([0-9]+\) '
+                                    r'MOD dn="cn=group,ou=Groups,dc=example,dc=com".*')
     # (Internal) op=10(1)(2) SRCH base="cn=group,ou=Groups,dc=example,dc=com"
-    assert topo.ds_access_log.match(r'.*\(Internal\) op=10\(1\)\(2\) SRCH base="cn=group,ou=Groups,dc=example,dc=com".*')
+    assert topo.ds_access_log.match(r'.*\(Internal\) op=[0-9]+\([0-9]+\)\([0-9]+\) '
+                                    r'SRCH base="cn=group,ou=Groups,dc=example,dc=com".*')
     # (Internal) op=10(1)(2) RESULT err=0 tag=48 nentries=1*')
-    assert topo.ds_access_log.match(r'.*\(Internal\) op=10\(1\)\(2\) RESULT err=0 tag=48 nentries=1*')
+    assert topo.ds_access_log.match(r'.*\(Internal\) op=[0-9]+\([0-9]+\)\([0-9]+\) RESULT err=0 tag=48 nentries=1*')
     # (Internal) op=10(1)(1) RESULT err=0 tag=48
-    assert topo.ds_access_log.match(r'.*\(Internal\) op=10\(1\)\(1\) RESULT err=0 tag=48.*')
+    assert topo.ds_access_log.match(r'.*\(Internal\) op=[0-9]+\([0-9]+\)\([0-9]+\) RESULT err=0 tag=48.*')
     # op=10 RESULT err=0 tag=105
-    assert not topo.ds_access_log.match(r'.*op=10 RESULT err=0 tag=105.*')
+    assert not topo.ds_access_log.match(r'.*op=[0-9]+ RESULT err=0 tag=105.*')
 
     log.info("Check the access logs for MOD operation of the user")
     # op=12 MODRDN dn="uid=test_user_777,ou=branch1,dc=example,dc=com" '
     #      'newrdn="uid=new_test_user_777" newsuperior="dc=example,dc=com"
-    assert not topo.ds_access_log.match(r'.*op=12 MODRDN dn="uid=test_user_777,ou=branch1,dc=example,dc=com" '
+    assert not topo.ds_access_log.match(r'.*op=[0-9]+ MODRDN dn="uid=test_user_777,ou=branch1,dc=example,dc=com" '
                                         'newrdn="uid=new_test_user_777" newsuperior="dc=example,dc=com".*')
     # (Internal) op=12(1)(1) SRCH base="uid=test_user_777, ou=branch1,dc=example,dc=com"
-    assert topo.ds_access_log.match(r'.*\(Internal\) op=12\(1\)\(1\) SRCH base="uid=test_user_777,'
+    assert topo.ds_access_log.match(r'.*\(Internal\) op=[0-9]+\([0-9]+\)\([0-9]+\) SRCH base="uid=test_user_777,'
                                     'ou=branch1,dc=example,dc=com".*')
     # (Internal) op=12(1)(1) RESULT err=0 tag=48 nentries=1
-    assert topo.ds_access_log.match(r'.*\(Internal\) op=12\(1\)\(1\) RESULT err=0 tag=48 nentries=1.*')
+    assert topo.ds_access_log.match(r'.*\(Internal\) op=[0-9]+\([0-9]+\)\([0-9]+\) RESULT err=0 tag=48 nentries=1.*')
     # op=12 RESULT err=0 tag=109
-    assert not topo.ds_access_log.match(r'.*op=12 RESULT err=0 tag=109.*')
+    assert not topo.ds_access_log.match(r'.*op=[0-9]+ RESULT err=0 tag=109.*')
 
     log.info("Check the access logs for DEL operation of the user")
     # op=15 DEL dn="uid=new_test_user_777,dc=example,dc=com"
-    assert not topo.ds_access_log.match(r'.*op=15 DEL dn="uid=new_test_user_777,dc=example,dc=com".*')
+    assert not topo.ds_access_log.match(r'.*op=[0-9]+ DEL dn="uid=new_test_user_777,dc=example,dc=com".*')
     # (Internal) op=15(1)(1) SRCH base="uid=new_test_user_777, dc=example,dc=com"
-    assert topo.ds_access_log.match(r'.*\(Internal\) op=15\(1\)\(1\) SRCH base="uid=new_test_user_777,'
+    assert topo.ds_access_log.match(r'.*\(Internal\) op=[0-9]+\([0-9]+\)\([0-9]+\) SRCH base="uid=new_test_user_777,'
                                     'dc=example,dc=com".*')
     # (Internal) op=15(1)(1) RESULT err=0 tag=48 nentries=1
-    assert topo.ds_access_log.match(r'.*\(Internal\) op=15\(1\)\(1\) RESULT err=0 tag=48 nentries=1.*')
+    assert topo.ds_access_log.match(r'.*\(Internal\) op=[0-9]+\([0-9]+\)\([0-9]+\) RESULT err=0 tag=48 nentries=1.*')
     # op=15 RESULT err=0 tag=107
-    assert not topo.ds_access_log.match(r'.*op=15 RESULT err=0 tag=107.*')
+    assert not topo.ds_access_log.match(r'.*op=[0-9]+ RESULT err=0 tag=107.*')
 
     log.info("Check if the other internal operations have the correct format")
     # conn=Internal(0) op=0
-    assert topo.ds_access_log.match(r'.*conn=Internal\(0\) op=0.*')
+    assert topo.ds_access_log.match(r'.*conn=Internal\([0-9]+\) op=[0-9]+\([0-9]+\)\([0-9]+\).*')
 
     log.info('Delete the previous access logs for the next test')
     topo.deleteAccessLogs()
@@ -558,56 +564,59 @@ def test_internal_log_level_516(topology_st, add_user_log_level_516):
     log.info('Restart the server to flush the logs')
     topo.restart()
 
-    # These comments contain lines we are trying to find without regex
+    # These comments contain lines we are trying to find without regex (the op numbers are just examples)
     log.info("Check the access logs for ADD operation of the user")
     # op=10 ADD dn="uid=test_user_777,ou=branch1,dc=example,dc=com"
-    assert not topo.ds_access_log.match(r'.*op=10 ADD dn="uid=test_user_777,ou=branch1,dc=example,dc=com".*')
+    assert not topo.ds_access_log.match(r'.*op=[0-9]+ ADD dn="uid=test_user_777,ou=branch1,dc=example,dc=com".*')
     # (Internal) op=10(1)(1) MOD dn="cn=group,ou=Groups,dc=example,dc=com"
-    assert topo.ds_access_log.match(r'.*\(Internal\) op=10\(1\)\(1\) MOD dn="cn=group,ou=Groups,dc=example,dc=com".*')
+    assert topo.ds_access_log.match(r'.*\(Internal\) op=[0-9]+\([0-9]+\)\([0-9]+\) '
+                                    r'MOD dn="cn=group,ou=Groups,dc=example,dc=com".*')
     # (Internal) op=10(1)(2) SRCH base="cn=group,ou=Groups,dc=example,dc=com"
-    assert topo.ds_access_log.match(r'.*\(Internal\) op=10\(1\)\(2\) SRCH base="cn=group,ou=Groups,dc=example,dc=com".*')
+    assert topo.ds_access_log.match(r'.*\(Internal\) op=[0-9]+\([0-9]+\)\([0-9]+\) '
+                                    r'SRCH base="cn=group,ou=Groups,dc=example,dc=com".*')
     # (Internal) op=10(1)(2) ENTRY dn="cn=group,ou=Groups,dc=example,dc=com"
-    assert topo.ds_access_log.match(r'.*\(Internal\) op=10\(1\)\(2\) ENTRY dn="cn=group,ou=Groups,dc=example,dc=com".*')
+    assert topo.ds_access_log.match(r'.*\(Internal\) op=[0-9]+\([0-9]+\)\([0-9]+\) '
+                                    r'ENTRY dn="cn=group,ou=Groups,dc=example,dc=com".*')
     # (Internal) op=10(1)(2) RESULT err=0 tag=48 nentries=1*')
-    assert topo.ds_access_log.match(r'.*\(Internal\) op=10\(1\)\(2\) RESULT err=0 tag=48 nentries=1*')
+    assert topo.ds_access_log.match(r'.*\(Internal\) op=[0-9]+\([0-9]+\)\([0-9]+\) RESULT err=0 tag=48 nentries=1*')
     # (Internal) op=10(1)(1) RESULT err=0 tag=48
-    assert topo.ds_access_log.match(r'.*\(Internal\) op=10\(1\)\(1\) RESULT err=0 tag=48.*')
+    assert topo.ds_access_log.match(r'.*\(Internal\) op=[0-9]+\([0-9]+\)\([0-9]+\) RESULT err=0 tag=48.*')
     # op=10 RESULT err=0 tag=105
-    assert not topo.ds_access_log.match(r'.*op=10 RESULT err=0 tag=105.*')
+    assert not topo.ds_access_log.match(r'.*op=[0-9]+ RESULT err=0 tag=105.*')
 
     log.info("Check the access logs for MOD operation of the user")
     # op=12 MODRDN dn="uid=test_user_777,ou=branch1,dc=example,dc=com" '
     #      'newrdn="uid=new_test_user_777" newsuperior="dc=example,dc=com"
-    assert not topo.ds_access_log.match(r'.*op=12 MODRDN dn="uid=test_user_777,ou=branch1,dc=example,dc=com" '
+    assert not topo.ds_access_log.match(r'.*op=[0-9]+ MODRDN dn="uid=test_user_777,ou=branch1,dc=example,dc=com" '
                                         'newrdn="uid=new_test_user_777" newsuperior="dc=example,dc=com".*')
     # Internal) op=12(1)(1) SRCH base="uid=test_user_777, ou=branch1,dc=example,dc=com"
-    assert topo.ds_access_log.match(r'.*\(Internal\) op=12\(1\)\(1\) SRCH base="uid=test_user_777,'
+    assert topo.ds_access_log.match(r'.*\(Internal\) op=[0-9]+\([0-9]+\)\([0-9]+\) SRCH base="uid=test_user_777,'
                                     'ou=branch1,dc=example,dc=com".*')
     # (Internal) op=12(1)(1) ENTRY dn="uid=test_user_777, ou=branch1,dc=example,dc=com"
-    assert topo.ds_access_log.match(r'.*\(Internal\) op=12\(1\)\(1\) ENTRY dn="uid=test_user_777,'
+    assert topo.ds_access_log.match(r'.*\(Internal\) op=[0-9]+\([0-9]+\)\([0-9]+\) ENTRY dn="uid=test_user_777,'
                                     'ou=branch1,dc=example,dc=com".*')
     # (Internal) op=12(1)(1) RESULT err=0 tag=48 nentries=1
-    assert topo.ds_access_log.match(r'.*\(Internal\) op=12\(1\)\(1\) RESULT err=0 tag=48 nentries=1.*')
+    assert topo.ds_access_log.match(r'.*\(Internal\) op=[0-9]+\([0-9]+\)\([0-9]+\) RESULT err=0 tag=48 nentries=1.*')
     # op=12 RESULT err=0 tag=109
-    assert not topo.ds_access_log.match(r'.*op=12 RESULT err=0 tag=109.*')
+    assert not topo.ds_access_log.match(r'.*op=[0-9]+ RESULT err=0 tag=109.*')
 
     log.info("Check the access logs for DEL operation of the user")
     # op=15 DEL dn="uid=new_test_user_777,dc=example,dc=com"
-    assert not topo.ds_access_log.match(r'.*op=15 DEL dn="uid=new_test_user_777,dc=example,dc=com".*')
+    assert not topo.ds_access_log.match(r'.*op=[0-9]+ DEL dn="uid=new_test_user_777,dc=example,dc=com".*')
     # (Internal) op=15(1)(1) SRCH base="uid=new_test_user_777, dc=example,dc=com"
-    assert topo.ds_access_log.match(r'.*\(Internal\) op=15\(1\)\(1\) SRCH base="uid=new_test_user_777,'
+    assert topo.ds_access_log.match(r'.*\(Internal\) op=[0-9]+\([0-9]+\)\([0-9]+\) SRCH base="uid=new_test_user_777,'
                                     'dc=example,dc=com".*')
     # (Internal) op=15(1)(1) ENTRY dn="uid=new_test_user_777, dc=example,dc=com"
-    assert topo.ds_access_log.match(r'.*\(Internal\) op=15\(1\)\(1\) ENTRY dn="uid=new_test_user_777,'
+    assert topo.ds_access_log.match(r'.*\(Internal\) op=[0-9]+\([0-9]+\)\([0-9]+\) ENTRY dn="uid=new_test_user_777,'
                                     'dc=example,dc=com".*')
     # (Internal) op=15(1)(1) RESULT err=0 tag=48 nentries=1
-    assert topo.ds_access_log.match(r'.*\(Internal\) op=15\(1\)\(1\) RESULT err=0 tag=48 nentries=1.*')
+    assert topo.ds_access_log.match(r'.*\(Internal\) op=[0-9]+\([0-9]+\)\([0-9]+\) RESULT err=0 tag=48 nentries=1.*')
     # op=15 RESULT err=0 tag=107
-    assert not topo.ds_access_log.match(r'.*op=15 RESULT err=0 tag=107.*')
+    assert not topo.ds_access_log.match(r'.*op=[0-9]+ RESULT err=0 tag=107.*')
 
     log.info("Check if the other internal operations have the correct format")
     # conn=Internal(0) op=0
-    assert topo.ds_access_log.match(r'.*conn=Internal\(0\) op=0.*')
+    assert topo.ds_access_log.match(r'.*conn=Internal\([0-9]+\) op=[0-9]+\([0-9]+\)\([0-9]+\).*')
 
     log.info('Delete the previous access logs for the next test')
     topo.deleteAccessLogs()
diff --git a/src/lib389/lib389/dirsrv_log.py b/src/lib389/lib389/dirsrv_log.py
index 1a626c2..b23fbe7 100644
--- a/src/lib389/lib389/dirsrv_log.py
+++ b/src/lib389/lib389/dirsrv_log.py
@@ -46,8 +46,8 @@ class DirsrvLog(object):
         """
         self.dirsrv = dirsrv
         self.log = self.dirsrv.log
-        self.prog_timestamp = re.compile('\[(?P<day>\d*)\/(?P<month>\w*)\/(?P<year>\d*):(?P<hour>\d*):(?P<minute>\d*):(?P<second>\d*)(.(?P<nanosecond>\d*))+\s(?P<tz>[\+\-]\d*)')   # noqa
-        self.prog_datetime = re.compile('^(?P<timestamp>\[.*\])')
+        self.prog_timestamp = re.compile(r'\[(?P<day>\d*)\/(?P<month>\w*)\/(?P<year>\d*):(?P<hour>\d*):(?P<minute>\d*):(?P<second>\d*)(.(?P<nanosecond>\d*))+\s(?P<tz>[\+\-]\d*)')   # noqa
+        self.prog_datetime = re.compile(r'^(?P<timestamp>\[.*\])')
 
     def _get_log_path(self):
         """Return the current log file location"""
@@ -180,13 +180,13 @@ class DirsrvAccessLog(DirsrvLog):
         """
         super(DirsrvAccessLog, self).__init__(dirsrv)
         ## We precompile our regex for parse_line to make it faster.
-        self.prog_m1 = re.compile('^(?P<timestamp>\[.*\])\sconn=(?P<conn>\d*)\sop=(?P<op>\d*)\s(?P<action>\w*)\s(?P<rem>.*)')
-        self.prog_con = re.compile('^(?P<timestamp>\[.*\])\sconn=(?P<conn>\d*)\sfd=(?P<fd>\d*)\sslot=(?P<slot>\d*)\sconnection\sfrom\s(?P<remote>[^\s]*)\sto\s(?P<local>[^\s]*)')
-        self.prog_discon = re.compile('^(?P<timestamp>\[.*\])\sconn=(?P<conn>\d*)\sop=(?P<op>\d*)\sfd=(?P<fd>\d*)\s(?P<action>closed)\s-\s(?P<status>\w*)')
+        self.prog_m1 = re.compile(r'^(?P<timestamp>\[.*\])\sconn=(?P<conn>\d*)\sop=(?P<op>\d*)\s(?P<action>\w*)\s(?P<rem>.*)')
+        self.prog_con = re.compile(r'^(?P<timestamp>\[.*\])\sconn=(?P<conn>\d*)\sfd=(?P<fd>\d*)\sslot=(?P<slot>\d*)\sconnection\sfrom\s(?P<remote>[^\s]*)\sto\s(?P<local>[^\s]*)')
+        self.prog_discon = re.compile(r'^(?P<timestamp>\[.*\])\sconn=(?P<conn>\d*)\sop=(?P<op>\d*)\sfd=(?P<fd>\d*)\s(?P<action>closed)\s-\s(?P<status>\w*)')
         # RESULT regex's (based off action.rem)
-        self.prog_notes = re.compile('err=(?P<err>\d*)\stag=(?P<tag>\d*)\snentries=(?P<nentries>\d*)\setime=(?P<etime>[0-9.]*)\snotes=(?P<notes>\w*)')
-        self.prog_repl = re.compile('err=(?P<err>\d*)\stag=(?P<tag>\d*)\snentries=(?P<nentries>\d*)\setime=(?P<etime>[0-9.]*)\scsn=(?P<csn>\w*)')
-        self.prog_result = re.compile('err=(?P<err>\d*)\stag=(?P<tag>\d*)\snentries=(?P<nentries>\d*)\setime=(?P<etime>[0-9.]*)\s(?P<rem>.*)')
+        self.prog_notes = re.compile(r'err=(?P<err>\d*)\stag=(?P<tag>\d*)\snentries=(?P<nentries>\d*)\setime=(?P<etime>[0-9.]*)\snotes=(?P<notes>\w*)')
+        self.prog_repl = re.compile(r'err=(?P<err>\d*)\stag=(?P<tag>\d*)\snentries=(?P<nentries>\d*)\setime=(?P<etime>[0-9.]*)\scsn=(?P<csn>\w*)')
+        self.prog_result = re.compile(r'err=(?P<err>\d*)\stag=(?P<tag>\d*)\snentries=(?P<nentries>\d*)\setime=(?P<etime>[0-9.]*)\s(?P<rem>.*)')
         # Lists for each regex type
         self.full_regexs = [self.prog_m1, self.prog_con, self.prog_discon]
         self.result_regexs = [self.prog_notes, self.prog_repl,
@@ -246,7 +246,7 @@ class DirsrvErrorLog(DirsrvLog):
         @param diursrv - A DirSrv object
         """
         super(DirsrvErrorLog, self).__init__(dirsrv)
-        self.prog_m1 = re.compile('^(?P<timestamp>\[.*\])\s(?P<message>.*)')
+        self.prog_m1 = re.compile(r'^(?P<timestamp>\[.*\])\s(?P<message>.*)')
 
     def _get_log_path(self):
         """Return the current log file location"""