Merge pull request #23 from google/fix

travis CI: Test config file

4 files changed, 56 insertions, 57 deletions

diff --git a/metadata/config.go b/metadata/config.go
index 8c7be55..0f95fbe 100644
--- a/metadata/config.go
+++ b/metadata/config.go
@@ -26,7 +26,6 @@
 //    * Reasonable defaults for a Policy's EncryptionOptions
 package metadata
 
-//go:generate protoc --go_out=. metadata.proto
 import (
 	"io"
 	"strings"
diff --git a/metadata/metadata.pb.go b/metadata/metadata.pb.go
index 37087ef..49a9f3c 100644
--- a/metadata/metadata.pb.go
+++ b/metadata/metadata.pb.go
@@ -1,12 +1,12 @@
 // Code generated by protoc-gen-go.
-// source: metadata.proto
+// source: metadata/metadata.proto
 // DO NOT EDIT!
 
 /*
 Package metadata is a generated protocol buffer package.
 
 It is generated from these files:
-	metadata.proto
+	metadata/metadata.proto
 
 It has these top-level messages:
 	HashingCosts
@@ -368,48 +368,48 @@ func init() {
 	proto.RegisterEnum("metadata.EncryptionOptions_Mode", EncryptionOptions_Mode_name, EncryptionOptions_Mode_value)
 }
 
-func init() { proto.RegisterFile("metadata.proto", fileDescriptor0) }
+func init() { proto.RegisterFile("metadata/metadata.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 626 bytes of a gzipped FileDescriptorProto
+	// 630 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0xdf, 0x6a, 0xdb, 0x3e,
-	0x14, 0xc7, 0x7f, 0xb6, 0xd3, 0xa4, 0x39, 0xf9, 0xf3, 0x73, 0xd5, 0xae, 0x98, 0xed, 0x26, 0x78,
-	0x1b, 0x94, 0x51, 0x0a, 0xcb, 0xe8, 0x60, 0x30, 0x06, 0x5b, 0x5a, 0xb6, 0xae, 0x94, 0x75, 0x4a,
-	0x69, 0x37, 0x18, 0x04, 0xd5, 0x56, 0x1b, 0x51, 0xdb, 0x12, 0x92, 0x42, 0xf0, 0xdd, 0x2e, 0xf6,
-	0x06, 0x7b, 0x97, 0x3d, 0xc4, 0x9e, 0x6a, 0x48, 0x4e, 0x1c, 0xa7, 0x85, 0x92, 0xed, 0xc6, 0x1c,
-	0x7d, 0x25, 0x9d, 0xef, 0xd1, 0x47, 0x3a, 0x86, 0x6e, 0x4a, 0x35, 0x89, 0x89, 0x26, 0x7b, 0x42,
-	0x72, 0xcd, 0xd1, 0xfa, 0x7c, 0x1c, 0x7e, 0x83, 0xf6, 0x07, 0xa2, 0xc6, 0x2c, 0xbb, 0x1e, 0x70,
-	0xa5, 0x15, 0x42, 0x50, 0xd3, 0x2c, 0xa5, 0x81, 0xdb, 0x73, 0x76, 0x3c, 0x6c, 0x63, 0xb4, 0x0d,
-	0xf5, 0x94, 0xa6, 0x5c, 0xe6, 0x81, 0x67, 0xd5, 0xd9, 0x08, 0xf5, 0xa0, 0x25, 0x88, 0x24, 0x49,
-	0x42, 0x13, 0xa6, 0xd2, 0xa0, 0x66, 0x27, 0xab, 0x52, 0xf8, 0x15, 0xba, 0x17, 0x92, 0x08, 0x41,
-	0xe3, 0x63, 0x9a, 0x1f, 0x10, 0x4d, 0x50, 0x17, 0xdc, 0xa3, 0xf3, 0xc0, 0xe9, 0x39, 0x3b, 0x6d,
-	0xec, 0x1e, 0x9d, 0xa3, 0xc7, 0xd0, 0xa1, 0x59, 0x24, 0x73, 0xa1, 0x69, 0x3c, 0xba, 0xa1, 0xb9,
-	0x35, 0x6e, 0xe3, 0x76, 0x29, 0x1e, 0xd3, 0xdc, 0x14, 0x35, 0x4e, 0x49, 0x64, 0xed, 0xdb, 0xd8,
-	0xc6, 0xe1, 0x4f, 0x17, 0x3a, 0xa7, 0x92, 0x6b, 0x1a, 0x69, 0x2e, 0x6d, 0xea, 0xe7, 0xb0, 0x25,
-	0xe6, 0xc2, 0x28, 0xa6, 0x2a, 0x92, 0x4c, 0x68, 0x2e, 0xad, 0x59, 0x13, 0x6f, 0x96, 0x73, 0x07,
-	0xe5, 0x14, 0xda, 0x85, 0xba, 0xe2, 0x13, 0x19, 0x15, 0xe7, 0xed, 0xf6, 0xb7, 0xf6, 0x4a, 0x50,
-	0x43, 0xab, 0x9f, 0xe5, 0x82, 0xe2, 0xd9, 0x1a, 0x53, 0x46, 0x46, 0x52, 0x6a, 0xcb, 0x68, 0x62,
-	0x1b, 0xa3, 0x5d, 0x58, 0x8b, 0x0c, 0x38, 0x7b, 0xfa, 0x56, 0x7f, 0x7b, 0x91, 0xa0, 0x8a, 0x15,
-	0x17, 0x8b, 0x4c, 0x06, 0x45, 0x12, 0x1d, 0xac, 0x15, 0x07, 0x31, 0x31, 0xf2, 0xc1, 0x9b, 0xb0,
-	0x38, 0xa8, 0x5b, 0x7a, 0x26, 0x44, 0xaf, 0xa0, 0x35, 0x2d, 0xa8, 0x59, 0x22, 0x0d, 0x9b, 0x39,
-	0x58, 0x64, 0x5e, 0x46, 0x8a, 0x61, 0x5a, 0x8e, 0xc3, 0x1f, 0x2e, 0x6c, 0x1c, 0x16, 0xe8, 0x18,
-	0xcf, 0x3e, 0xd9, 0xaf, 0x42, 0x01, 0x34, 0x04, 0x89, 0x63, 0x96, 0x5d, 0x5b, 0x18, 0x1e, 0x9e,
-	0x0f, 0xd1, 0x6b, 0x58, 0x8f, 0x78, 0xa6, 0x69, 0xa6, 0xd5, 0x0c, 0x41, 0x6f, 0xe1, 0x73, 0x27,
-	0xd1, 0xde, 0x09, 0x8f, 0x29, 0x2e, 0x77, 0xa0, 0x37, 0xd0, 0xbc, 0x62, 0x09, 0x35, 0x20, 0x94,
-	0xa5, 0xb2, 0xca, 0xf6, 0xc5, 0x96, 0xf0, 0x02, 0x6a, 0x46, 0x42, 0x2d, 0x68, 0xc4, 0xf4, 0x8a,
-	0x4c, 0x12, 0xed, 0xff, 0x87, 0xfe, 0x87, 0xd6, 0xdb, 0xc3, 0xe1, 0xa8, 0xbf, 0xff, 0x72, 0xf4,
-	0xe5, 0x6c, 0xe8, 0x3b, 0x55, 0xe1, 0xfd, 0xe0, 0xc4, 0x77, 0xab, 0xc2, 0xe0, 0xdd, 0xc0, 0xf7,
-	0x96, 0x84, 0xb3, 0xa1, 0x5f, 0x0b, 0xbf, 0x3b, 0xe0, 0xcf, 0x28, 0x9d, 0xf2, 0x84, 0x45, 0xb9,
-	0x79, 0x45, 0xff, 0xf0, 0x3e, 0x6e, 0xdd, 0x84, 0xfb, 0x17, 0x37, 0xf1, 0xcb, 0x01, 0x28, 0xbc,
-	0xed, 0xe3, 0x7c, 0x0a, 0xdd, 0x1b, 0x9a, 0xdf, 0xb5, 0xed, 0xdc, 0xd0, 0xbc, 0x62, 0xb8, 0x0f,
-	0x0d, 0x5e, 0xc0, 0x9a, 0x99, 0x3d, 0xba, 0x87, 0x27, 0x9e, 0xaf, 0x45, 0x1f, 0x61, 0x73, 0x5e,
-	0xa7, 0xb0, 0x9e, 0xa6, 0x5c, 0x73, 0x25, 0xde, 0x4e, 0xab, 0xff, 0xf0, 0x4e, 0xbd, 0x25, 0x13,
-	0xbc, 0x31, 0xbd, 0xa5, 0xa8, 0xf0, 0xb7, 0x03, 0xf5, 0x01, 0xcf, 0xae, 0xd8, 0x75, 0xa5, 0x3d,
-	0x9c, 0x15, 0xda, 0x63, 0x1f, 0x60, 0x4c, 0xd4, 0x78, 0x54, 0xf4, 0x83, 0x7b, 0x6f, 0x3f, 0x34,
-	0xcd, 0xca, 0xe2, 0x8f, 0xf3, 0x04, 0x3a, 0x11, 0x4f, 0x05, 0xd1, 0xec, 0x92, 0x25, 0x4c, 0xe7,
-	0xb3, 0xf6, 0x5a, 0x16, 0xab, 0x60, 0x6a, 0xab, 0x83, 0x79, 0xf6, 0x19, 0x60, 0x51, 0xe9, 0xf2,
-	0x3b, 0x43, 0xd0, 0x15, 0x24, 0x1d, 0x09, 0xa2, 0x94, 0x18, 0x4b, 0xa2, 0xa8, 0xef, 0xa0, 0x07,
-	0xb0, 0x11, 0x4d, 0x94, 0xe6, 0x4b, 0xb2, 0x6b, 0xf6, 0x49, 0x32, 0x35, 0x4c, 0x7d, 0xef, 0xb2,
-	0x6e, 0x7f, 0xa1, 0x2f, 0xfe, 0x04, 0x00, 0x00, 0xff, 0xff, 0x75, 0xb7, 0xbf, 0x4e, 0x54, 0x05,
-	0x00, 0x00,
+	0x14, 0xc7, 0x7f, 0xb6, 0xd3, 0xa4, 0x39, 0xf9, 0xf3, 0x73, 0xd5, 0xae, 0x33, 0xdb, 0x4d, 0xf0,
+	0x36, 0x28, 0xa3, 0x74, 0x2c, 0xa3, 0x83, 0xc1, 0x18, 0x6c, 0x69, 0xd9, 0xba, 0x52, 0xd6, 0x29,
+	0xa5, 0xdd, 0x60, 0x10, 0x54, 0x5b, 0x6d, 0x44, 0x6d, 0x4b, 0x48, 0x0a, 0xc1, 0x77, 0xbb, 0xd8,
+	0x1b, 0xec, 0x5d, 0xf6, 0x10, 0x7b, 0xaa, 0x21, 0x39, 0x71, 0x9c, 0x16, 0x4a, 0xb7, 0x1b, 0x73,
+	0xf4, 0x95, 0x74, 0xbe, 0x47, 0x1f, 0xe9, 0x18, 0xee, 0xa7, 0x54, 0x93, 0x98, 0x68, 0xf2, 0x6c,
+	0x1e, 0xec, 0x08, 0xc9, 0x35, 0x47, 0xab, 0xf3, 0x71, 0xf8, 0x0d, 0xda, 0x1f, 0x88, 0x1a, 0xb3,
+	0xec, 0x72, 0xc0, 0x95, 0x56, 0x08, 0x41, 0x4d, 0xb3, 0x94, 0x06, 0x6e, 0xcf, 0xd9, 0xf2, 0xb0,
+	0x8d, 0xd1, 0x26, 0xd4, 0x53, 0x9a, 0x72, 0x99, 0x07, 0x9e, 0x55, 0x67, 0x23, 0xd4, 0x83, 0x96,
+	0x20, 0x92, 0x24, 0x09, 0x4d, 0x98, 0x4a, 0x83, 0x9a, 0x9d, 0xac, 0x4a, 0xe1, 0x57, 0xe8, 0x9e,
+	0x49, 0x22, 0x04, 0x8d, 0x0f, 0x69, 0xbe, 0x47, 0x34, 0x41, 0x5d, 0x70, 0x0f, 0x4e, 0x03, 0xa7,
+	0xe7, 0x6c, 0xb5, 0xb1, 0x7b, 0x70, 0x8a, 0x1e, 0x41, 0x87, 0x66, 0x91, 0xcc, 0x85, 0xa6, 0xf1,
+	0xe8, 0x8a, 0xe6, 0xd6, 0xb8, 0x8d, 0xdb, 0xa5, 0x78, 0x48, 0x73, 0x53, 0xd4, 0x38, 0x25, 0x91,
+	0xb5, 0x6f, 0x63, 0x1b, 0x87, 0x3f, 0x5d, 0xe8, 0x1c, 0x4b, 0xae, 0x69, 0xa4, 0xb9, 0xb4, 0xa9,
+	0x9f, 0xc3, 0x86, 0x98, 0x0b, 0xa3, 0x98, 0xaa, 0x48, 0x32, 0xa1, 0xb9, 0xb4, 0x66, 0x4d, 0xbc,
+	0x5e, 0xce, 0xed, 0x95, 0x53, 0x68, 0x1b, 0xea, 0x8a, 0x4f, 0x64, 0x54, 0x9c, 0xb7, 0xdb, 0xdf,
+	0xd8, 0x29, 0x41, 0x0d, 0xad, 0x7e, 0x92, 0x0b, 0x8a, 0x67, 0x6b, 0x4c, 0x19, 0x19, 0x49, 0xa9,
+	0x2d, 0xa3, 0x89, 0x6d, 0x8c, 0xb6, 0x61, 0x25, 0x32, 0xe0, 0xec, 0xe9, 0x5b, 0xfd, 0xcd, 0x45,
+	0x82, 0x2a, 0x56, 0x5c, 0x2c, 0x32, 0x19, 0x14, 0x49, 0x74, 0xb0, 0x52, 0x1c, 0xc4, 0xc4, 0xc8,
+	0x07, 0x6f, 0xc2, 0xe2, 0xa0, 0x6e, 0xe9, 0x99, 0x10, 0xbd, 0x82, 0xd6, 0xb4, 0xa0, 0x66, 0x89,
+	0x34, 0x6c, 0xe6, 0x60, 0x91, 0x79, 0x19, 0x29, 0x86, 0x69, 0x39, 0x0e, 0x7f, 0xb8, 0xb0, 0xb6,
+	0x5f, 0xa0, 0x63, 0x3c, 0xfb, 0x64, 0xbf, 0x0a, 0x05, 0xd0, 0x10, 0x24, 0x8e, 0x59, 0x76, 0x69,
+	0x61, 0x78, 0x78, 0x3e, 0x44, 0xaf, 0x61, 0x35, 0xe2, 0x99, 0xa6, 0x99, 0x56, 0x33, 0x04, 0xbd,
+	0x85, 0xcf, 0x8d, 0x44, 0x3b, 0x47, 0x3c, 0xa6, 0xb8, 0xdc, 0x81, 0xde, 0x40, 0xf3, 0x82, 0x25,
+	0xd4, 0x80, 0x50, 0x96, 0xca, 0x5d, 0xb6, 0x2f, 0xb6, 0x84, 0x67, 0x50, 0x33, 0x12, 0x6a, 0x41,
+	0x23, 0xa6, 0x17, 0x64, 0x92, 0x68, 0xff, 0x3f, 0xf4, 0x3f, 0xb4, 0xde, 0xee, 0x0f, 0x47, 0xfd,
+	0xdd, 0x97, 0xa3, 0x2f, 0x27, 0x43, 0xdf, 0xa9, 0x0a, 0xef, 0x07, 0x47, 0xbe, 0x5b, 0x15, 0x06,
+	0xef, 0x06, 0xbe, 0xb7, 0x24, 0x9c, 0x0c, 0xfd, 0x5a, 0xf8, 0xdd, 0x01, 0x7f, 0x46, 0xe9, 0x98,
+	0x27, 0x2c, 0xca, 0xcd, 0x2b, 0xfa, 0x87, 0xf7, 0x71, 0xed, 0x26, 0xdc, 0xbf, 0xb8, 0x89, 0x5f,
+	0x0e, 0x40, 0xe1, 0x6d, 0x1f, 0xe7, 0x13, 0xe8, 0x5e, 0xd1, 0xfc, 0xa6, 0x6d, 0xe7, 0x8a, 0xe6,
+	0x15, 0xc3, 0x5d, 0x68, 0xf0, 0x02, 0xd6, 0xcc, 0xec, 0xe1, 0x2d, 0x3c, 0xf1, 0x7c, 0x2d, 0xfa,
+	0x08, 0xeb, 0xf3, 0x3a, 0x85, 0xf5, 0x34, 0xe5, 0x9a, 0x2b, 0xf1, 0xb6, 0x5a, 0xfd, 0x07, 0x37,
+	0xea, 0x2d, 0x99, 0xe0, 0xb5, 0xe9, 0x35, 0x45, 0x85, 0xbf, 0x1d, 0xa8, 0x0f, 0x78, 0x76, 0xc1,
+	0x2e, 0x2b, 0xed, 0xe1, 0xdc, 0xa1, 0x3d, 0x76, 0x01, 0xc6, 0x44, 0x8d, 0x47, 0x45, 0x3f, 0xb8,
+	0xb7, 0xf6, 0x43, 0xd3, 0xac, 0x2c, 0xfe, 0x38, 0x8f, 0xa1, 0x13, 0xf1, 0x54, 0x10, 0xcd, 0xce,
+	0x59, 0xc2, 0x74, 0x3e, 0x6b, 0xaf, 0x65, 0xb1, 0x0a, 0xa6, 0x76, 0x77, 0x30, 0x4f, 0x3f, 0x03,
+	0x2c, 0x2a, 0x5d, 0x7e, 0x67, 0x08, 0xba, 0x82, 0xa4, 0x23, 0x41, 0x94, 0x12, 0x63, 0x49, 0x14,
+	0xf5, 0x1d, 0x74, 0x0f, 0xd6, 0xa2, 0x89, 0xd2, 0x7c, 0x49, 0x76, 0xcd, 0x3e, 0x49, 0xa6, 0x86,
+	0xa9, 0xef, 0x9d, 0xd7, 0xed, 0x2f, 0xf4, 0xc5, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf9, 0xff,
+	0x1e, 0x31, 0x5d, 0x05, 0x00, 0x00,
 }
diff --git a/metadata/metadata.proto b/metadata/metadata.proto
index 395cdff..1bec64f 100644
--- a/metadata/metadata.proto
+++ b/metadata/metadata.proto
@@ -19,6 +19,7 @@
  * the License.
  */
 
+// If you modify this file, be sure to run "go generate" on this package.
 syntax = "proto3";
 package metadata;
 
diff --git a/metadata/policy_test.go b/metadata/policy_test.go
index cc6b36f..783a784 100644
--- a/metadata/policy_test.go
+++ b/metadata/policy_test.go
@@ -37,14 +37,13 @@ var goodPolicy = &PolicyData{
 }
 
 // Creates a temporary directory for testing.
-func createTestDirectory() (directory string, err error) {
-	baseDirectory, err := util.TestPath()
+func createTestDirectory(t *testing.T) (directory string, err error) {
+	baseDirectory, err := util.TestRoot()
 	if err != nil {
-		return
+		t.Skip(err)
 	}
 	if s, err := os.Stat(baseDirectory); err != nil || !s.IsDir() {
-		return "", fmt.Errorf("%s: %q is not a valid directory",
-			util.TestEnvVarName, baseDirectory)
+		return "", fmt.Errorf("test directory %q is not valid", baseDirectory)
 	}
 
 	directoryPath := filepath.Join(baseDirectory, "test")
@@ -53,8 +52,8 @@ func createTestDirectory() (directory string, err error) {
 
 // Makes a test directory, makes a file in the directory, and fills the file
 // with data. Returns the directory name, file name, and error (if one).
-func createTestFile() (directory, file string, err error) {
-	if directory, err = createTestDirectory(); err != nil {
+func createTestFile(t *testing.T) (directory, file string, err error) {
+	if directory, err = createTestDirectory(t); err != nil {
 		return
 	}
 	// Cleanup if the file creation fails
@@ -77,7 +76,7 @@ func createTestFile() (directory, file string, err error) {
 
 // Tests that we can set a policy on an empty directory
 func TestSetPolicyEmptyDirectory(t *testing.T) {
-	directory, err := createTestDirectory()
+	directory, err := createTestDirectory(t)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -90,7 +89,7 @@ func TestSetPolicyEmptyDirectory(t *testing.T) {
 
 // Tests that we cannot set a policy on a nonempty directory
 func TestSetPolicyNonemptyDirectory(t *testing.T) {
-	directory, _, err := createTestFile()
+	directory, _, err := createTestFile(t)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -103,7 +102,7 @@ func TestSetPolicyNonemptyDirectory(t *testing.T) {
 
 // Tests that we cannot set a policy on a file
 func TestSetPolicyFile(t *testing.T) {
-	directory, file, err := createTestFile()
+	directory, file, err := createTestFile(t)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -120,7 +119,7 @@ func TestSetPolicyBadDescriptors(t *testing.T) {
 	badDescriptors := []string{"123456789abcde", "xxxxxxxxxxxxxxxx", "0123456789abcdef00"}
 	for _, badDescriptor := range badDescriptors {
 		badPolicy := &PolicyData{KeyDescriptor: badDescriptor, Options: DefaultOptions}
-		directory, err := createTestDirectory()
+		directory, err := createTestDirectory(t)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -134,7 +133,7 @@ func TestSetPolicyBadDescriptors(t *testing.T) {
 
 // Tests that we get back the same policy that we set on a directory
 func TestGetPolicyEmptyDirectory(t *testing.T) {
-	directory, err := createTestDirectory()
+	directory, err := createTestDirectory(t)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -155,7 +154,7 @@ func TestGetPolicyEmptyDirectory(t *testing.T) {
 
 // Tests that we cannot get a policy on an unencrypted directory
 func TestGetPolicyUnencrypted(t *testing.T) {
-	directory, err := createTestDirectory()
+	directory, err := createTestDirectory(t)
 	if err != nil {
 		t.Fatal(err)
 	}