commit bb5b84886c839b2983498f429f09817f139434fe
author Christopher Wiley <wiley@chromium.org> Thu Feb 12 13:42:16 2015 -0800
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Fri Feb 13 06:48:25 2015 +0000
tree 47a68bb0da31731fe764226ac3cae985a762c822
parent 1dbad47c63dceb5a7ad49871fc256e3b1179511c

buffet: Allow tests to pass in a path to search for command definitions

This allows us to dynamically generate commands to test Buffet with at
runtime.  The read only nature of the file system makes this difficult
with just the statically configured files.

BUG=brillo:172
TEST=unittests, buffet_Registration passes with this change.

Change-Id: I54a92edadbb5c8a5ebad63b8464d87bb21ba5aa2
Reviewed-on: https://chromium-review.googlesource.com/249440
Tested-by: Christopher Wiley <wiley@chromium.org>
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>
Commit-Queue: Christopher Wiley <wiley@chromium.org>

buffet/main.cc

diff --git a/buffet/main.cc b/buffet/main.cc
index ab3798a..a4156c4 100644
--- a/buffet/main.cc
+++ b/buffet/main.cc
@@ -24,10 +24,12 @@
 class Daemon : public DBusServiceDaemon {
  public:
   Daemon(const base::FilePath& config_path,
-         const base::FilePath& state_path)
+         const base::FilePath& state_path,
+         const base::FilePath& test_definitions_path)
       : DBusServiceDaemon(kServiceName, kRootServicePath),
         config_path_{config_path},
-        state_path_{state_path} {}
+        state_path_{state_path},
+        test_definitions_path_{test_definitions_path} {}
 
  protected:
   void RegisterDBusObjectsAsync(AsyncEventSequencer* sequencer) override {
@@ -35,6 +37,7 @@
     manager_->RegisterAsync(
         config_path_,
         state_path_,
+        test_definitions_path_,
         sequencer->GetHandler("Manager.RegisterAsync() failed.", true));
   }
 
@@ -42,6 +45,7 @@
   std::unique_ptr<buffet::Manager> manager_;
   const base::FilePath config_path_;
   const base::FilePath state_path_;
+  const base::FilePath test_definitions_path_;
 
   DISALLOW_COPY_AND_ASSIGN(Daemon);
 };
@@ -60,15 +64,17 @@
                 "Path to file containing config information.");
   DEFINE_string(state_path, kDefaultStateFilePath,
                 "Path to file containing state information.");
+  DEFINE_string(test_definitions_path, "",
+                "Path to directory containing additional command "
+                "and state definitions.  For use in test only.");
   chromeos::FlagHelper::Init(argc, argv, "Privet protocol handler daemon");
-
   if (FLAGS_config_path.empty())
     FLAGS_config_path = kDefaultConfigFilePath;
   if (FLAGS_state_path.empty())
     FLAGS_state_path = kDefaultStateFilePath;
-
   chromeos::InitLog(chromeos::kLogToSyslog | chromeos::kLogHeader);
   buffet::Daemon daemon{base::FilePath{FLAGS_config_path},
-                        base::FilePath{FLAGS_state_path}};
+                        base::FilePath{FLAGS_state_path},
+                        base::FilePath{FLAGS_test_definitions_path}};
   return daemon.Run();
 }