From 8adbcccd02d133f9650486019911f41afe80100d Mon Sep 17 00:00:00 2001
From: David Steele <david@pgmasters.net>
Date: Wed, 6 Apr 2016 10:00:11 -0400
Subject: [PATCH] Closed #184: Change test/log directory to test/expect.

This should make it clearer that these are expect logs for regression testing.
---
 test/{log => expect}/backup-archive-get-001.log  |  0
 test/{log => expect}/backup-archive-get-002.log  |  0
 test/{log => expect}/backup-archive-get-003.log  |  0
 test/{log => expect}/backup-archive-get-004.log  |  0
 test/{log => expect}/backup-archive-get-005.log  |  0
 test/{log => expect}/backup-archive-get-006.log  |  0
 test/{log => expect}/backup-archive-get-007.log  |  0
 test/{log => expect}/backup-archive-get-008.log  |  0
 test/{log => expect}/backup-archive-push-001.log |  0
 test/{log => expect}/backup-archive-push-002.log |  0
 test/{log => expect}/backup-archive-push-003.log |  0
 test/{log => expect}/backup-archive-push-004.log |  0
 test/{log => expect}/backup-archive-push-005.log |  0
 test/{log => expect}/backup-archive-push-006.log |  0
 test/{log => expect}/backup-archive-push-007.log |  0
 test/{log => expect}/backup-archive-push-008.log |  0
 test/{log => expect}/backup-archive-stop-001.log |  0
 test/{log => expect}/backup-archive-stop-002.log |  0
 test/{log => expect}/backup-archive-stop-003.log |  0
 test/{log => expect}/backup-archive-stop-004.log |  0
 test/{log => expect}/backup-archive-stop-005.log |  0
 test/{log => expect}/backup-archive-stop-006.log |  0
 test/{log => expect}/backup-expire-001.log       |  0
 test/{log => expect}/backup-synthetic-001.log    |  0
 test/{log => expect}/backup-synthetic-002.log    |  0
 test/{log => expect}/backup-synthetic-003.log    |  0
 test/{log => expect}/backup-synthetic-004.log    |  0
 test/{log => expect}/backup-synthetic-005.log    |  0
 test/{log => expect}/backup-synthetic-006.log    |  0
 test/{log => expect}/backup-synthetic-007.log    |  0
 test/{log => expect}/backup-synthetic-008.log    |  0
 test/{log => expect}/help-help-001.log           |  0
 test/lib/BackRestTest/Common/LogTest.pm          | 10 +++++-----
 33 files changed, 5 insertions(+), 5 deletions(-)
 rename test/{log => expect}/backup-archive-get-001.log (100%)
 rename test/{log => expect}/backup-archive-get-002.log (100%)
 rename test/{log => expect}/backup-archive-get-003.log (100%)
 rename test/{log => expect}/backup-archive-get-004.log (100%)
 rename test/{log => expect}/backup-archive-get-005.log (100%)
 rename test/{log => expect}/backup-archive-get-006.log (100%)
 rename test/{log => expect}/backup-archive-get-007.log (100%)
 rename test/{log => expect}/backup-archive-get-008.log (100%)
 rename test/{log => expect}/backup-archive-push-001.log (100%)
 rename test/{log => expect}/backup-archive-push-002.log (100%)
 rename test/{log => expect}/backup-archive-push-003.log (100%)
 rename test/{log => expect}/backup-archive-push-004.log (100%)
 rename test/{log => expect}/backup-archive-push-005.log (100%)
 rename test/{log => expect}/backup-archive-push-006.log (100%)
 rename test/{log => expect}/backup-archive-push-007.log (100%)
 rename test/{log => expect}/backup-archive-push-008.log (100%)
 rename test/{log => expect}/backup-archive-stop-001.log (100%)
 rename test/{log => expect}/backup-archive-stop-002.log (100%)
 rename test/{log => expect}/backup-archive-stop-003.log (100%)
 rename test/{log => expect}/backup-archive-stop-004.log (100%)
 rename test/{log => expect}/backup-archive-stop-005.log (100%)
 rename test/{log => expect}/backup-archive-stop-006.log (100%)
 rename test/{log => expect}/backup-expire-001.log (100%)
 rename test/{log => expect}/backup-synthetic-001.log (100%)
 rename test/{log => expect}/backup-synthetic-002.log (100%)
 rename test/{log => expect}/backup-synthetic-003.log (100%)
 rename test/{log => expect}/backup-synthetic-004.log (100%)
 rename test/{log => expect}/backup-synthetic-005.log (100%)
 rename test/{log => expect}/backup-synthetic-006.log (100%)
 rename test/{log => expect}/backup-synthetic-007.log (100%)
 rename test/{log => expect}/backup-synthetic-008.log (100%)
 rename test/{log => expect}/help-help-001.log (100%)

diff --git a/test/log/backup-archive-get-001.log b/test/expect/backup-archive-get-001.log
similarity index 100%
rename from test/log/backup-archive-get-001.log
rename to test/expect/backup-archive-get-001.log
diff --git a/test/log/backup-archive-get-002.log b/test/expect/backup-archive-get-002.log
similarity index 100%
rename from test/log/backup-archive-get-002.log
rename to test/expect/backup-archive-get-002.log
diff --git a/test/log/backup-archive-get-003.log b/test/expect/backup-archive-get-003.log
similarity index 100%
rename from test/log/backup-archive-get-003.log
rename to test/expect/backup-archive-get-003.log
diff --git a/test/log/backup-archive-get-004.log b/test/expect/backup-archive-get-004.log
similarity index 100%
rename from test/log/backup-archive-get-004.log
rename to test/expect/backup-archive-get-004.log
diff --git a/test/log/backup-archive-get-005.log b/test/expect/backup-archive-get-005.log
similarity index 100%
rename from test/log/backup-archive-get-005.log
rename to test/expect/backup-archive-get-005.log
diff --git a/test/log/backup-archive-get-006.log b/test/expect/backup-archive-get-006.log
similarity index 100%
rename from test/log/backup-archive-get-006.log
rename to test/expect/backup-archive-get-006.log
diff --git a/test/log/backup-archive-get-007.log b/test/expect/backup-archive-get-007.log
similarity index 100%
rename from test/log/backup-archive-get-007.log
rename to test/expect/backup-archive-get-007.log
diff --git a/test/log/backup-archive-get-008.log b/test/expect/backup-archive-get-008.log
similarity index 100%
rename from test/log/backup-archive-get-008.log
rename to test/expect/backup-archive-get-008.log
diff --git a/test/log/backup-archive-push-001.log b/test/expect/backup-archive-push-001.log
similarity index 100%
rename from test/log/backup-archive-push-001.log
rename to test/expect/backup-archive-push-001.log
diff --git a/test/log/backup-archive-push-002.log b/test/expect/backup-archive-push-002.log
similarity index 100%
rename from test/log/backup-archive-push-002.log
rename to test/expect/backup-archive-push-002.log
diff --git a/test/log/backup-archive-push-003.log b/test/expect/backup-archive-push-003.log
similarity index 100%
rename from test/log/backup-archive-push-003.log
rename to test/expect/backup-archive-push-003.log
diff --git a/test/log/backup-archive-push-004.log b/test/expect/backup-archive-push-004.log
similarity index 100%
rename from test/log/backup-archive-push-004.log
rename to test/expect/backup-archive-push-004.log
diff --git a/test/log/backup-archive-push-005.log b/test/expect/backup-archive-push-005.log
similarity index 100%
rename from test/log/backup-archive-push-005.log
rename to test/expect/backup-archive-push-005.log
diff --git a/test/log/backup-archive-push-006.log b/test/expect/backup-archive-push-006.log
similarity index 100%
rename from test/log/backup-archive-push-006.log
rename to test/expect/backup-archive-push-006.log
diff --git a/test/log/backup-archive-push-007.log b/test/expect/backup-archive-push-007.log
similarity index 100%
rename from test/log/backup-archive-push-007.log
rename to test/expect/backup-archive-push-007.log
diff --git a/test/log/backup-archive-push-008.log b/test/expect/backup-archive-push-008.log
similarity index 100%
rename from test/log/backup-archive-push-008.log
rename to test/expect/backup-archive-push-008.log
diff --git a/test/log/backup-archive-stop-001.log b/test/expect/backup-archive-stop-001.log
similarity index 100%
rename from test/log/backup-archive-stop-001.log
rename to test/expect/backup-archive-stop-001.log
diff --git a/test/log/backup-archive-stop-002.log b/test/expect/backup-archive-stop-002.log
similarity index 100%
rename from test/log/backup-archive-stop-002.log
rename to test/expect/backup-archive-stop-002.log
diff --git a/test/log/backup-archive-stop-003.log b/test/expect/backup-archive-stop-003.log
similarity index 100%
rename from test/log/backup-archive-stop-003.log
rename to test/expect/backup-archive-stop-003.log
diff --git a/test/log/backup-archive-stop-004.log b/test/expect/backup-archive-stop-004.log
similarity index 100%
rename from test/log/backup-archive-stop-004.log
rename to test/expect/backup-archive-stop-004.log
diff --git a/test/log/backup-archive-stop-005.log b/test/expect/backup-archive-stop-005.log
similarity index 100%
rename from test/log/backup-archive-stop-005.log
rename to test/expect/backup-archive-stop-005.log
diff --git a/test/log/backup-archive-stop-006.log b/test/expect/backup-archive-stop-006.log
similarity index 100%
rename from test/log/backup-archive-stop-006.log
rename to test/expect/backup-archive-stop-006.log
diff --git a/test/log/backup-expire-001.log b/test/expect/backup-expire-001.log
similarity index 100%
rename from test/log/backup-expire-001.log
rename to test/expect/backup-expire-001.log
diff --git a/test/log/backup-synthetic-001.log b/test/expect/backup-synthetic-001.log
similarity index 100%
rename from test/log/backup-synthetic-001.log
rename to test/expect/backup-synthetic-001.log
diff --git a/test/log/backup-synthetic-002.log b/test/expect/backup-synthetic-002.log
similarity index 100%
rename from test/log/backup-synthetic-002.log
rename to test/expect/backup-synthetic-002.log
diff --git a/test/log/backup-synthetic-003.log b/test/expect/backup-synthetic-003.log
similarity index 100%
rename from test/log/backup-synthetic-003.log
rename to test/expect/backup-synthetic-003.log
diff --git a/test/log/backup-synthetic-004.log b/test/expect/backup-synthetic-004.log
similarity index 100%
rename from test/log/backup-synthetic-004.log
rename to test/expect/backup-synthetic-004.log
diff --git a/test/log/backup-synthetic-005.log b/test/expect/backup-synthetic-005.log
similarity index 100%
rename from test/log/backup-synthetic-005.log
rename to test/expect/backup-synthetic-005.log
diff --git a/test/log/backup-synthetic-006.log b/test/expect/backup-synthetic-006.log
similarity index 100%
rename from test/log/backup-synthetic-006.log
rename to test/expect/backup-synthetic-006.log
diff --git a/test/log/backup-synthetic-007.log b/test/expect/backup-synthetic-007.log
similarity index 100%
rename from test/log/backup-synthetic-007.log
rename to test/expect/backup-synthetic-007.log
diff --git a/test/log/backup-synthetic-008.log b/test/expect/backup-synthetic-008.log
similarity index 100%
rename from test/log/backup-synthetic-008.log
rename to test/expect/backup-synthetic-008.log
diff --git a/test/log/help-help-001.log b/test/expect/help-help-001.log
similarity index 100%
rename from test/log/help-help-001.log
rename to test/expect/help-help-001.log
diff --git a/test/lib/BackRestTest/Common/LogTest.pm b/test/lib/BackRestTest/Common/LogTest.pm
index 58509a77f..79a880c05 100644
--- a/test/lib/BackRestTest/Common/LogTest.pm
+++ b/test/lib/BackRestTest/Common/LogTest.pm
@@ -207,7 +207,7 @@ sub logWrite
             {name => 'strBasePath', trace => true},
             {name => 'strTestPath', trace => true},
             {name => 'strFileName',
-             default => sprintf("log/$self->{strModule}-$self->{strTest}-%03d.log", $self->{iRun}), trace => true}
+             default => sprintf("expect/$self->{strModule}-$self->{strTest}-%03d.log", $self->{iRun}), trace => true}
         );
 
     my $strReferenceLogFile = "${strBasePath}/test/${strFileName}";
@@ -219,22 +219,22 @@ sub logWrite
     }
     else
     {
-        my $strTestLogPath = "${strTestPath}/log";
+        my $strTestLogPath = "${strTestPath}/expect";
 
         if (!-e $strTestLogPath)
         {
             mkdir($strTestLogPath) or
-                confess "unable to create test log path ${strTestLogPath}";
+                confess "unable to create expect log path ${strTestLogPath}";
         }
 
         $strTestLogFile = "${strTestPath}/${strFileName}";
     }
 
     open(my $hFile, '>', $strTestLogFile)
-        or confess "could not open test log file '${strTestLogFile}': $!";
+        or confess "unable to open expect log file '${strTestLogFile}': $!";
 
     syswrite($hFile, $self->{strLog})
-        or confess "could not write to test log file '${strTestLogFile}': $!";
+        or confess "unable to write expect log file '${strTestLogFile}': $!";
 
     close($hFile);