Skip to content

test: modernize some tests #1272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fwsGonzo merged 4 commits into from
Mar 31, 2017
Merged

test: modernize some tests #1272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c6dd319
Merge branch 'dev' of https://github.com/hioa-cs/IncludeOS into dev
ingve Mar 28, 2017
4b9a680
Merge branch 'dev' of https://github.com/hioa-cs/IncludeOS into dev
ingve Mar 29, 2017
55eed37
Merge branch 'dev' of https://github.com/hioa-cs/IncludeOS into dev
ingve Mar 29, 2017
c0e0858
test: modernize some tests
ingve Mar 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions test/fs/unit/memdisk_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@

CASE("memdisk properties")
{
auto disk = fs::new_shared_memdisk();
EXPECT(disk->empty() == true);
EXPECT(disk->device_id() == 0);
EXPECT(disk->fs_ready() == false);
EXPECT(disk->name() == "memdisk0");
EXPECT(disk->dev().size() == 0ull);
EXPECT(disk->dev().device_type() == "Block device");
EXPECT(disk->dev().driver_name() == "MemDisk");
fs::Disk& disk = fs::memdisk();
EXPECT(disk.empty() == true);
EXPECT(disk.device_id() == 0);
EXPECT(disk.fs_ready() == false);
EXPECT(disk.name() == "memdisk0");
EXPECT(disk.dev().size() == 0ull);
EXPECT(disk.dev().device_type() == "Block device");
EXPECT(disk.dev().driver_name() == "MemDisk");
bool enumerated_partitions {false};

fs::Disk::on_parts_func part_fn = [&enumerated_partitions, &lest_env]
(fs::error_t err, std::vector<fs::Disk::Partition>& partitions)
{
Expand All @@ -39,6 +39,6 @@ CASE("memdisk properties")
}
};

disk->partitions(part_fn);
disk.partitions(part_fn);
EXPECT(enumerated_partitions == true);
}
10 changes: 5 additions & 5 deletions test/posix/integration/conf/service.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ extern "C" void test_sysconf();
extern "C" void test_pathconf();
extern "C" void test_pwd();

fs::Disk_ptr& memdisk() {
static auto disk = fs::new_shared_memdisk();
fs::Disk& memdisk() {
fs::Disk& disk = fs::memdisk();

if (not disk->fs_ready()) {
disk->init_fs([](fs::error_t err, auto&) {
if (not disk.fs_ready()) {
disk.init_fs([](fs::error_t err, auto&) {
if (err) {
printf("ERROR MOUNTING DISK\n");
printf("%s\n", err.reason().c_str());
Expand All @@ -58,7 +58,7 @@ int main(int, char **) {
test_sysconf();

// mount a disk with contents for testing
auto root = memdisk()->fs().stat("/");
auto root = memdisk().fs().stat("/");
fs::mount("/etc", root, "test fs");
test_pathconf();

Expand Down