From 7f61facdea100d67388999f70c597300ebddfc76 Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Wed, 29 Apr 2015 17:40:11 -0500
Subject: [PATCH] MAGETWO-36071: Move
dev/tools/Magento/Tools/Dependency/generate/*.dependencies.php tools
- reverted integration test config file
---
dev/tests/integration/etc/install-config-mysql.php.dist | 2 +-
.../Command/_files/root/app/code/Magento/A/Model/Foo.php | 2 +-
.../Command/_files/root/app/code/Magento/A/etc/module.xml | 6 +-----
.../Command/_files/root/app/code/Magento/B/Model/Foo.php | 2 +-
.../Command/_files/root/app/code/Magento/B/etc/module.xml | 6 +-----
5 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/dev/tests/integration/etc/install-config-mysql.php.dist b/dev/tests/integration/etc/install-config-mysql.php.dist
index 975ad9c0be4..0d8fb591eb1 100644
--- a/dev/tests/integration/etc/install-config-mysql.php.dist
+++ b/dev/tests/integration/etc/install-config-mysql.php.dist
@@ -7,7 +7,7 @@
return [
'db_host' => 'localhost',
'db_user' => 'root',
- 'db_password' => 'root',
+ 'db_password' => '',
'db_name' => 'magento_integration_tests',
'db_prefix' => '',
'backend_frontname' => 'backend',
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/_files/root/app/code/Magento/A/Model/Foo.php b/dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/_files/root/app/code/Magento/A/Model/Foo.php
index f09ea608523..6300096a6eb 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/_files/root/app/code/Magento/A/Model/Foo.php
+++ b/dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/_files/root/app/code/Magento/A/Model/Foo.php
@@ -11,4 +11,4 @@ class Foo
{
$frameworkDependencies = new \Magento\Framework\A();
}
-}
\ No newline at end of file
+}
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/_files/root/app/code/Magento/A/etc/module.xml b/dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/_files/root/app/code/Magento/A/etc/module.xml
index dd60aeb295b..00ea68c891a 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/_files/root/app/code/Magento/A/etc/module.xml
+++ b/dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/_files/root/app/code/Magento/A/etc/module.xml
@@ -6,9 +6,5 @@
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
- <module name="Magento_AdminNotification" setup_version="2.0.0">
- <sequence>
- <module name="Magento_Store"/>
- </sequence>
- </module>
+ <module name="Magento_A" setup_version="2.0.0" />
</config>
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/_files/root/app/code/Magento/B/Model/Foo.php b/dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/_files/root/app/code/Magento/B/Model/Foo.php
index b42c3197030..5868020636a 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/_files/root/app/code/Magento/B/Model/Foo.php
+++ b/dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/_files/root/app/code/Magento/B/Model/Foo.php
@@ -11,4 +11,4 @@ class Foo
{
$frameworkDependencies = new \Magento\Framework\B();
}
-}
\ No newline at end of file
+}
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/_files/root/app/code/Magento/B/etc/module.xml b/dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/_files/root/app/code/Magento/B/etc/module.xml
index 6c30cdc5c72..8d5f746d8ec 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/_files/root/app/code/Magento/B/etc/module.xml
+++ b/dev/tests/integration/testsuite/Magento/Test/Tools/Console/Command/_files/root/app/code/Magento/B/etc/module.xml
@@ -6,9 +6,5 @@
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
- <module name="Magento_Authorization" setup_version="2.0.0">
- <sequence>
- <module name="Magento_Backend"/>
- </sequence>
- </module>
+ <module name="Magento_B" setup_version="2.0.0" />
</config>
--
GitLab