Fix BUILD_SCM_* being looked for in the stable status file and test it.

They're actually in the volatile status file, which is where it seems
like they belong.

Fixes #216.

--
Change-Id: Ibec7737538ff5c1003b61d1bd3396948c61886de
Reviewed-on: https://bazel-review.googlesource.com/1950
MOS_MIGRATED_REVID=102791996

1 files changed, 8 insertions, 6 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/BazelWorkspaceStatusModule.java b/src/main/java/com/google/devtools/build/lib/bazel/BazelWorkspaceStatusModule.java
index 5a59cab882..17996f45e6 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/BazelWorkspaceStatusModule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/BazelWorkspaceStatusModule.java
@@ -239,16 +239,18 @@ public class BazelWorkspaceStatusModule extends BlazeModule {
           BuildInfo.BUILD_HOST,
           Key.of(KeyType.STRING, "hostname", "redacted"),
           BuildInfo.BUILD_USER,
-          Key.of(KeyType.STRING, "username", "redacted"),
-          BuildInfo.BUILD_SCM_REVISION,
-          Key.of(KeyType.STRING, "0", "0"),
-          BuildInfo.BUILD_SCM_STATUS,
-          Key.of(KeyType.STRING, "", "redacted"));
+          Key.of(KeyType.STRING, "username", "redacted"));
     }
 
     @Override
     public ImmutableMap<String, Key> getVolatileKeys() {
-      return ImmutableMap.of(BuildInfo.BUILD_TIMESTAMP, Key.of(KeyType.INTEGER, "0", "0"));
+      return ImmutableMap.of(
+          BuildInfo.BUILD_TIMESTAMP,
+          Key.of(KeyType.INTEGER, "0", "0"),
+          BuildInfo.BUILD_SCM_REVISION,
+          Key.of(KeyType.STRING, "0", "0"),
+          BuildInfo.BUILD_SCM_STATUS,
+          Key.of(KeyType.STRING, "", "redacted"));
     }
   }