MAGECLOUD-3940: Use more OS agnostic form to find number of processors (#569)

Author: keithbentrup

.travis.yml

@@ -50,7 +50,9 @@ matrix:
       env: TEST_SUITE=functional
 
 install:
-  - composer config http-basic.repo.magento.com ${REPO_USERNAME} ${REPO_PASSWORD}
+  - if [ $TRAVIS_SECURE_ENV_VARS != "true" ]; then composer remove magento/magento-cloud-components --no-update; fi;
+  - if [ $TRAVIS_SECURE_ENV_VARS != "true" ]; then composer config --unset repositories.repo.magento.com; fi;
+  - if [ $TRAVIS_SECURE_ENV_VARS == "true" ]; then composer config http-basic.repo.magento.com ${REPO_USERNAME} ${REPO_PASSWORD}; fi;
   - composer update -n --no-suggest
 
 before_script:
@@ -62,7 +64,7 @@ before_script:
 
 script:
   - if [ $TEST_SUITE == "static-unit" ]; then ./tests/travis/static-unit.sh; fi
-  - if [ $TRAVIS_SECURE_ENV_VARS == "true" ] && [ $TEST_SUITE == "integration" ]; then ./tests/travis/integration.sh; fi
-  - if [ $TRAVIS_SECURE_ENV_VARS == "true" ] && [ $TEST_SUITE == "functional" ]; then ./tests/travis/functional.sh; fi
+  - if [ $TRAVIS_SECURE_ENV_VARS == "true" ] && [ $TEST_SUITE == "integration" ]; then ./tests/travis/integration.sh; fi;
+  - if [ $TRAVIS_SECURE_ENV_VARS == "true" ] && [ $TEST_SUITE == "functional" ]; then ./tests/travis/functional.sh; fi;
 
 after_failure: docker ps -s

composer.json

@@ -4,12 +4,12 @@
   "type": "magento2-component",
   "version": "2002.0.20",
   "license": "OSL-3.0",
-  "repositories": [
-    {
+  "repositories": {
+    "repo.magento.com": {
       "type": "composer",
       "url": "https://repo.magento.com/"
     }
-  ],
+  },
   "require": {
     "php": "^7.0",
     "ext-PDO": "*",

src/Test/Unit/Util/CpuTest.php

@@ -51,7 +51,7 @@ public function testGetTreadsCount()
             ->willReturn('8');
         $this->shellMock->expects($this->once())
             ->method('execute')
-            ->with('grep -c processor /proc/cpuinfo')
+            ->with('nproc')
             ->willReturn($processMock);
 
         $this->assertEquals(8, $this->cpu->getThreadsCount());

src/Util/Cpu.php

@@ -45,7 +45,7 @@ public function __construct(ShellInterface $shell, LoggerInterface $logger)
     public function getThreadsCount(): int
     {
         try {
-            $result = $this->shell->execute('grep -c processor /proc/cpuinfo');
+            $result = $this->shell->execute('nproc');
             $threadCount = (int)$result->getOutput() ?? 1;
         } catch (ShellException $e) {
             $this->logger->error('Can\'t get system processor count: ' . $e->getMessage());