Fix tests

yaybu · Mar 9, 2015 · ad70549 · ad70549
1 parent a66c92d
commit ad70549
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/fuselage/argument.py b/fuselage/argument.py
@@ -182,6 +182,9 @@ class File(Argument):
     def __set__(self, instance, value):
         setattr(instance, self.arg_id, value)
 
+    def _generate_valid(self):
+        return '/tmp/foo'
+
     def serialize(self, instance, builder=None):
         assert builder
         if not hasattr(instance, self.arg_id):

diff --git a/fuselage/providers/files.py b/fuselage/providers/files.py
@@ -42,17 +42,16 @@ def apply(self):
 
         self.check_path(os.path.dirname(name))
 
-        contents = ""
-        if self.resource.contents:
-            contents = self.resource.contents
-        elif self.resource.source:
+        if self.resource.source:
             if self.resource.source.startswith("bundle://"):
                 import pkgutil
                 loader = pkgutil.get_loader("fuselage")
                 contents = loader.get_data("assets/" + self.resource.source[9:])
             else:
                 with open(self.resource.source, "rb") as fp:
                     contents = fp.read()
+        else:
+            contents = self.resource.contents
 
         fc = EnsureFile(
             name,