diff options
author | Michael Schroeder <mls@suse.de> | 2020-11-12 10:50:59 +0100 |
---|---|---|
committer | Michael Schroeder <mls@suse.de> | 2020-11-12 10:50:59 +0100 |
commit | 55ff43d734f1a6fcd556661d847d210e8c248d00 (patch) | |
tree | 896a46a35eb022c633e1101cbbe8e2d56f45e6b8 | |
parent | 402198e1fa675c2783015fe08c669e34dfd9990a (diff) |
Fix flatpak testcase
-rw-r--r-- | Build/Flatpak.pm | 9 | ||||
-rw-r--r-- | t/flatpak.t | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/Build/Flatpak.pm b/Build/Flatpak.pm index aa30aaf..567e687 100644 --- a/Build/Flatpak.pm +++ b/Build/Flatpak.pm @@ -66,8 +66,7 @@ sub parse { if ($fn =~ m/\.ya?ml\z/) { $data = _load_yaml_file($fn); return { error => "Failed to parse YAML file '$fn'" } unless defined $data; - } - elsif ($fn =~ m/\.json\z/) { + } elsif ($fn =~ m/\.json\z/) { # We don't have JSON::PP, but YAML is a superset of JSON $data = _load_yaml_file($fn); return { error => "Failed to parse JSON file '$fn'" } unless defined $data; @@ -76,8 +75,10 @@ sub parse { # close $fh; # $data = eval { decode_json($json) }; # return { error => "Failed to parse JSON file" } unless defined $data; - } - else { + } elsif (ref($fn) eq 'SCALAR') { + $data = _load_yaml($$fn); # used in the unit test + return { error => "Failed to parse '$fn'" } unless defined $data; + } else { $data = _load_yaml_file($fn); return { error => "Failed to parse file '$fn'" } unless defined $data; } diff --git a/t/flatpak.t b/t/flatpak.t index d774606..b7b6edc 100644 --- a/t/flatpak.t +++ b/t/flatpak.t @@ -35,7 +35,7 @@ subtest parse => sub { ], }; my $yaml = do { local $/; <DATA> }; - my $data = Build::Flatpak::parse($conf, $yaml); + my $data = Build::Flatpak::parse($conf, \$yaml); is_deeply $data, $expected, 'parse() YAML flatpak content'; $data = Build::Flatpak::parse($conf, "$path/flatpak.yaml"); |